--- bad.1	2008-11-05 09:57:00.000000000 +0100
+++ good.1	2008-11-05 09:57:01.000000000 +0100
@@ -52,12 +52,12 @@
 T@1    : | | | exit: to: '/home/sven/bzr/debug-max/5.1/mysql-test/var/tmp'
 T@1    : | | <cleanup_dirname
 T@1    : | | >_mymalloc
-T@1    : | | | enter: Size: 48
+T@1    : | | | enter: Size: 50
 T@1    : | | | exit: ptr: 0xHEX
 T@1    : | | <_mymalloc
 T@1    : | <init_tmpdir
 T@1    : | >_mymalloc
-T@1    : | | enter: Size: 48
+T@1    : | | enter: Size: 50
 T@1    : | | exit: ptr: 0xHEX
 T@1    : | <_mymalloc
 T@1    : | >convert_dirname
@@ -66,7 +66,7 @@
 T@1    : | | enter: ptr: 0xHEX
 T@1    : | <_myfree
 T@1    : | >_mymalloc
-T@1    : | | enter: Size: 45
+T@1    : | | enter: Size: 47
 T@1    : | | exit: ptr: 0xHEX
 T@1    : | <_mymalloc
 T@1    : | >_mymalloc
@@ -133,7 +133,7 @@
 T@1    : | | | <my_open
 T@1    : | | | >my_register_filename
 T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 58
+T@1    : | | | | | enter: Size: 60
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <_mymalloc
 T@1    : | | | | exit: fd: 4
@@ -872,7 +872,7 @@
 T@1    : | | <my_open
 T@1    : | | >my_register_filename
 T@1    : | | | >_mymalloc
-T@1    : | | | | enter: Size: 58
+T@1    : | | | | enter: Size: 60
 T@1    : | | | | exit: ptr: 0xHEX
 T@1    : | | | <_mymalloc
 T@1    : | | | exit: fd: 4
@@ -904,11 +904,11 @@
 T@1    : | | exit: ptr: 0xHEX
 T@1    : | <_mymalloc
 T@1    : | >_mymalloc
-T@1    : | | enter: Size: 59
+T@1    : | | enter: Size: 61
 T@1    : | | exit: ptr: 0xHEX
 T@1    : | <_mymalloc
 T@1    : | >_mymalloc
-T@1    : | | enter: Size: 64
+T@1    : | | enter: Size: 66
 T@1    : | | exit: ptr: 0xHEX
 T@1    : | <_mymalloc
 T@1    : | >bitmap_init
@@ -994,7 +994,7 @@
 T@1    : | | | my: Name: '/home/sven/bzr/debug-max/5.1/mysql-test/var/master-data/riska.lower-test' CreateFlags: 438  AccessFlags: 2  MyFlags: 0
 T@1    : | | | >my_register_filename
 T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 73
+T@1    : | | | | | enter: Size: 75
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <_mymalloc
 T@1    : | | | | exit: fd: 4
@@ -1073,7 +1073,7 @@
 T@1    : | | | my: Name: '/home/sven/bzr/debug-max/5.1/mysql-test/var/master-data/riska.lower-test' CreateFlags: 438  AccessFlags: 2  MyFlags: 0
 T@1    : | | | >my_register_filename
 T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 73
+T@1    : | | | | | enter: Size: 75
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <_mymalloc
 T@1    : | | | | exit: fd: 4
@@ -1197,7 +1197,7 @@
 T@1    : | | | enter: ptr: 0xHEX
 T@1    : | | <_myfree
 T@1    : | | >_mymalloc
-T@1    : | | | enter: Size: 59
+T@1    : | | | enter: Size: 61
 T@1    : | | | exit: ptr: 0xHEX
 T@1    : | | <_mymalloc
 T@1    : | | >fn_format
@@ -1228,7 +1228,7 @@
 T@1    : | | <my_open
 T@1    : | | >my_register_filename
 T@1    : | | | >_mymalloc
-T@1    : | | | | enter: Size: 65
+T@1    : | | | | enter: Size: 67
 T@1    : | | | | exit: ptr: 0xHEX
 T@1    : | | | <_mymalloc
 T@1    : | | | exit: fd: 4
@@ -2709,15 +2709,15 @@
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <alloc_root
 T@1    : | | | | >construct_options
-T@1    : | | | | | plugin: plugin: 'MyISAM'  enabled: 1  can_disable: 0
+T@1    : | | | | | plugin: plugin: 'MRG_MYISAM'  enabled: 1  can_disable: 1
 T@1    : | | | | <construct_options
 T@1    : | | | | >init_variables
-T@1    : | | | | | options: name: 'myisam'
+T@1    : | | | | | options: name: 'mrg-myisam'
 T@1    : | | | | | >init_one_value
 T@1    : | | | | | <init_one_value
 T@1    : | | | | | >init_one_value
 T@1    : | | | | | <init_one_value
-T@1    : | | | | | options: name: 'plugin-myisam'
+T@1    : | | | | | options: name: 'plugin-mrg-myisam'
 T@1    : | | | | | >init_one_value
 T@1    : | | | | | <init_one_value
 T@1    : | | | | | >init_one_value
@@ -2732,23 +2732,6 @@
 T@1    : | | | | >my_hash_first
 T@1    : | | | | <my_hash_first
 T@1    : | | | <register_builtin
-T@1    : | | | >plugin_initialize
-T@1    : | | | | >ha_initialize_handlerton
-T@1    : | | | | | plugin: initialize plugin: 'MyISAM'
-T@1    : | | | | | >_mymalloc
-T@1    : | | | | | | enter: Size: 152
-T@1    : | | | | | | exit: ptr: 0xHEX
-T@1    : | | | | | <_mymalloc
-T@1    : | | | | | plugin: total_ha: 1
-T@1    : | | | | <ha_initialize_handlerton
-T@1    : | | | <plugin_initialize
-T@1    : | | | >intern_plugin_lock
-T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 4
-T@1    : | | | | | exit: ptr: 0xHEX
-T@1    : | | | | <_mymalloc
-T@1    : | | | | info: thd: 0xHEX, plugin: "MyISAM", ref_count: 1
-T@1    : | | | <intern_plugin_lock
 T@1    : | | | >free_root
 T@1    : | | | | enter: root: 0xHEX  flags: 2
 T@1    : | | | <free_root
@@ -2762,15 +2745,15 @@
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <alloc_root
 T@1    : | | | | >construct_options
-T@1    : | | | | | plugin: plugin: 'MRG_MYISAM'  enabled: 1  can_disable: 1
+T@1    : | | | | | plugin: plugin: 'MyISAM'  enabled: 1  can_disable: 0
 T@1    : | | | | <construct_options
 T@1    : | | | | >init_variables
-T@1    : | | | | | options: name: 'mrg-myisam'
+T@1    : | | | | | options: name: 'myisam'
 T@1    : | | | | | >init_one_value
 T@1    : | | | | | <init_one_value
 T@1    : | | | | | >init_one_value
 T@1    : | | | | | <init_one_value
-T@1    : | | | | | options: name: 'plugin-mrg-myisam'
+T@1    : | | | | | options: name: 'plugin-myisam'
 T@1    : | | | | | >init_one_value
 T@1    : | | | | | <init_one_value
 T@1    : | | | | | >init_one_value
@@ -2785,6 +2768,23 @@
 T@1    : | | | | >my_hash_first
 T@1    : | | | | <my_hash_first
 T@1    : | | | <register_builtin
+T@1    : | | | >plugin_initialize
+T@1    : | | | | >ha_initialize_handlerton
+T@1    : | | | | | plugin: initialize plugin: 'MyISAM'
+T@1    : | | | | | >_mymalloc
+T@1    : | | | | | | enter: Size: 152
+T@1    : | | | | | | exit: ptr: 0xHEX
+T@1    : | | | | | <_mymalloc
+T@1    : | | | | | plugin: total_ha: 1
+T@1    : | | | | <ha_initialize_handlerton
+T@1    : | | | <plugin_initialize
+T@1    : | | | >intern_plugin_lock
+T@1    : | | | | >_mymalloc
+T@1    : | | | | | enter: Size: 4
+T@1    : | | | | | exit: ptr: 0xHEX
+T@1    : | | | | <_mymalloc
+T@1    : | | | | info: thd: 0xHEX, plugin: "MyISAM", ref_count: 1
+T@1    : | | | <intern_plugin_lock
 T@1    : | | | >free_root
 T@1    : | | | | enter: root: 0xHEX  flags: 2
 T@1    : | | | <free_root
@@ -3070,7 +3070,7 @@
 T@1    : | | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | | >_mymalloc
@@ -3251,7 +3251,7 @@
 T@1    : | | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | | enter: Size: 73
+T@1    : | | | | | | | | | | | | | enter: Size: 75
 T@1    : | | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | | exit: fd: 5
@@ -3898,7 +3898,7 @@
 T@1    : | | | | info: log_type: 1
 T@1    : | | | <MYSQL_LOG::init
 T@1    : | | | >_mymalloc
-T@1    : | | | | enter: Size: 64
+T@1    : | | | | enter: Size: 66
 T@1    : | | | | exit: ptr: 0xHEX
 T@1    : | | | <_mymalloc
 T@1    : | | | >fn_format
@@ -3929,7 +3929,7 @@
 T@1    : | | | <my_open
 T@1    : | | | >my_register_filename
 T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 64
+T@1    : | | | | | enter: Size: 66
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <_mymalloc
 T@1    : | | | | exit: fd: 5
@@ -3953,7 +3953,7 @@
 T@1    : | | | >my_b_flush_io_cache
 T@1    : | | | | enter: cache: 0xHEX
 T@1    : | | | | >my_write
-T@1    : | | | | | my: Fd: 5  Buffer: 0xHEX  Count: 238  MyFlags: 20
+T@1    : | | | | | my: Fd: 5  Buffer: 0xHEX  Count: 242  MyFlags: 20
 T@1    : | | | | <my_write
 T@1    : | | | <my_b_flush_io_cache
 T@1    : | | <MYSQL_LOG::open
@@ -3963,7 +3963,7 @@
 T@1    : | | | | info: log_type: 1
 T@1    : | | | <MYSQL_LOG::init
 T@1    : | | | >_mymalloc
-T@1    : | | | | enter: Size: 59
+T@1    : | | | | enter: Size: 61
 T@1    : | | | | exit: ptr: 0xHEX
 T@1    : | | | <_mymalloc
 T@1    : | | | >fn_format
@@ -3994,7 +3994,7 @@
 T@1    : | | | <my_open
 T@1    : | | | >my_register_filename
 T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 59
+T@1    : | | | | | enter: Size: 61
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <_mymalloc
 T@1    : | | | | exit: fd: 6
@@ -4018,7 +4018,7 @@
 T@1    : | | | >my_b_flush_io_cache
 T@1    : | | | | enter: cache: 0xHEX
 T@1    : | | | | >my_write
-T@1    : | | | | | my: Fd: 6  Buffer: 0xHEX  Count: 238  MyFlags: 20
+T@1    : | | | | | my: Fd: 6  Buffer: 0xHEX  Count: 242  MyFlags: 20
 T@1    : | | | | <my_write
 T@1    : | | | <my_b_flush_io_cache
 T@1    : | | <MYSQL_LOG::open
@@ -4033,7 +4033,7 @@
 T@1    : | | | >plugin_find_internal
 T@1    : | | | <plugin_find_internal
 T@1    : | | | >my_hash_first
-T@1    : | | | | exit: found key at 7
+T@1    : | | | | exit: found key at 2
 T@1    : | | | <my_hash_first
 T@1    : | | | >intern_plugin_lock
 T@1    : | | | | >_mymalloc
@@ -4061,7 +4061,7 @@
 T@1    : | | | | | info: log_type: 2
 T@1    : | | | | <MYSQL_LOG::init
 T@1    : | | | | >_mymalloc
-T@1    : | | | | | enter: Size: 59
+T@1    : | | | | | enter: Size: 61
 T@1    : | | | | | exit: ptr: 0xHEX
 T@1    : | | | | <_mymalloc
 T@1    : | | | | >fn_format
@@ -4202,7 +4202,7 @@
 T@1    : | | | | <my_open
 T@1    : | | | | >my_register_filename
 T@1    : | | | | | >_mymalloc
-T@1    : | | | | | | enter: Size: 66
+T@1    : | | | | | | enter: Size: 68
 T@1    : | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | <_mymalloc
 T@1    : | | | | | exit: fd: 7
@@ -4252,7 +4252,7 @@
 T@1    : | | | >my_b_flush_io_cache
 T@1    : | | | | enter: cache: 0xHEX
 T@1    : | | | | >my_write
-T@1    : | | | | | my: Fd: 4  Buffer: 0xHEX  Count: 66  MyFlags: 52
+T@1    : | | | | | my: Fd: 4  Buffer: 0xHEX  Count: 68  MyFlags: 52
 T@1    : | | | | <my_write
 T@1    : | | | <my_b_flush_io_cache
 T@1    : | | | >my_sync
@@ -6502,7 +6502,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -6847,7 +6847,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 71
+T@1    : | | | | | | | | | | | | enter: Size: 73
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 10
@@ -6895,7 +6895,7 @@
 T@1    : | | | | | | | | | | <my_read
 T@1    : | | | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 1912
+T@1    : | | | | | | | | | | | | enter: Size: 1920
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | <my_multi_malloc
@@ -7239,7 +7239,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -7762,7 +7762,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 71
+T@1    : | | | | | | | | | | | | enter: Size: 73
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 12
@@ -7810,7 +7810,7 @@
 T@1    : | | | | | | | | | | <my_read
 T@1    : | | | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 2520
+T@1    : | | | | | | | | | | | | enter: Size: 2528
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | <my_multi_malloc
@@ -8192,7 +8192,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -8557,7 +8557,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 69
+T@1    : | | | | | | | | | | | | enter: Size: 71
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 14
@@ -9924,7 +9924,7 @@
 T@1    : | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | >_mymalloc
@@ -10097,7 +10097,7 @@
 T@1    : | | | | | | | | <my_open
 T@1    : | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 88
+T@1    : | | | | | | | | | | enter: Size: 90
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | exit: fd: 16
@@ -10145,7 +10145,7 @@
 T@1    : | | | | | | | | <my_read
 T@1    : | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 1352
+T@1    : | | | | | | | | | | enter: Size: 1360
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | <my_multi_malloc
@@ -10450,7 +10450,7 @@
 T@1    : | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | >_mymalloc
@@ -10627,7 +10627,7 @@
 T@1    : | | | | | | | | <my_open
 T@1    : | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 81
+T@1    : | | | | | | | | | | enter: Size: 83
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | exit: fd: 18
@@ -10980,7 +10980,7 @@
 T@1    : | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | >_mymalloc
@@ -11157,7 +11157,7 @@
 T@1    : | | | | | | | | <my_open
 T@1    : | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 76
+T@1    : | | | | | | | | | | enter: Size: 78
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | exit: fd: 20
@@ -11510,7 +11510,7 @@
 T@1    : | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | >_mymalloc
@@ -11711,7 +11711,7 @@
 T@1    : | | | | | | | | <my_open
 T@1    : | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 92
+T@1    : | | | | | | | | | | enter: Size: 94
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | exit: fd: 22
@@ -12070,7 +12070,7 @@
 T@1    : | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | >_mymalloc
@@ -12251,7 +12251,7 @@
 T@1    : | | | | | | | | <my_open
 T@1    : | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 87
+T@1    : | | | | | | | | | | enter: Size: 89
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | exit: fd: 24
@@ -12299,7 +12299,7 @@
 T@1    : | | | | | | | | <my_read
 T@1    : | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | enter: Size: 1408
+T@1    : | | | | | | | | | | enter: Size: 1416
 T@1    : | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | <my_multi_malloc
@@ -12641,7 +12641,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 1  tt_time: 78796800  offset: 1
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 0  int_keypos: 145350048
+T@1    : | | | | enter: nextflag: 8  lastpos: 0  int_keypos: 145350072
 T@1    : | | | | exit: found key at 13
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12651,7 +12651,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 2  tt_time: 94694401  offset: 2
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 13  int_keypos: 145350062
+T@1    : | | | | enter: nextflag: 8  lastpos: 13  int_keypos: 145350086
 T@1    : | | | | exit: found key at 26
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12661,7 +12661,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 3  tt_time: 126230402  offset: 3
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 26  int_keypos: 145350076
+T@1    : | | | | enter: nextflag: 8  lastpos: 26  int_keypos: 145350100
 T@1    : | | | | exit: found key at 39
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12671,7 +12671,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 4  tt_time: 157766403  offset: 4
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 39  int_keypos: 145350090
+T@1    : | | | | enter: nextflag: 8  lastpos: 39  int_keypos: 145350114
 T@1    : | | | | exit: found key at 52
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12681,7 +12681,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 5  tt_time: 189302404  offset: 5
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 52  int_keypos: 145350104
+T@1    : | | | | enter: nextflag: 8  lastpos: 52  int_keypos: 145350128
 T@1    : | | | | exit: found key at 65
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12691,7 +12691,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 6  tt_time: 220924805  offset: 6
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 65  int_keypos: 145350118
+T@1    : | | | | enter: nextflag: 8  lastpos: 65  int_keypos: 145350142
 T@1    : | | | | exit: found key at 78
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12701,7 +12701,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 7  tt_time: 252460806  offset: 7
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 78  int_keypos: 145350132
+T@1    : | | | | enter: nextflag: 8  lastpos: 78  int_keypos: 145350156
 T@1    : | | | | exit: found key at 91
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12711,7 +12711,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 8  tt_time: 283996807  offset: 8
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 91  int_keypos: 145350146
+T@1    : | | | | enter: nextflag: 8  lastpos: 91  int_keypos: 145350170
 T@1    : | | | | exit: found key at 104
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12721,7 +12721,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 9  tt_time: 315532808  offset: 9
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 104  int_keypos: 145350160
+T@1    : | | | | enter: nextflag: 8  lastpos: 104  int_keypos: 145350184
 T@1    : | | | | exit: found key at 117
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12731,7 +12731,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 10  tt_time: 362793609  offset: 10
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 117  int_keypos: 145350174
+T@1    : | | | | enter: nextflag: 8  lastpos: 117  int_keypos: 145350198
 T@1    : | | | | exit: found key at 130
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12741,7 +12741,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 11  tt_time: 394329610  offset: 11
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 130  int_keypos: 145350188
+T@1    : | | | | enter: nextflag: 8  lastpos: 130  int_keypos: 145350212
 T@1    : | | | | exit: found key at 143
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12751,7 +12751,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 12  tt_time: 425865611  offset: 12
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 143  int_keypos: 145350202
+T@1    : | | | | enter: nextflag: 8  lastpos: 143  int_keypos: 145350226
 T@1    : | | | | exit: found key at 156
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12761,7 +12761,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 13  tt_time: 489024012  offset: 13
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 156  int_keypos: 145350216
+T@1    : | | | | enter: nextflag: 8  lastpos: 156  int_keypos: 145350240
 T@1    : | | | | exit: found key at 169
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12771,7 +12771,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 14  tt_time: 567993613  offset: 14
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 169  int_keypos: 145350230
+T@1    : | | | | enter: nextflag: 8  lastpos: 169  int_keypos: 145350254
 T@1    : | | | | exit: found key at 182
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12781,7 +12781,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 15  tt_time: 631152014  offset: 15
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 182  int_keypos: 145350244
+T@1    : | | | | enter: nextflag: 8  lastpos: 182  int_keypos: 145350268
 T@1    : | | | | exit: found key at 195
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12791,7 +12791,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 16  tt_time: 662688015  offset: 16
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 195  int_keypos: 145350258
+T@1    : | | | | enter: nextflag: 8  lastpos: 195  int_keypos: 145350282
 T@1    : | | | | exit: found key at 208
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12801,7 +12801,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 17  tt_time: 709948816  offset: 17
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 208  int_keypos: 145350272
+T@1    : | | | | enter: nextflag: 8  lastpos: 208  int_keypos: 145350296
 T@1    : | | | | exit: found key at 221
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12811,7 +12811,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 18  tt_time: 741484817  offset: 18
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 221  int_keypos: 145350286
+T@1    : | | | | enter: nextflag: 8  lastpos: 221  int_keypos: 145350310
 T@1    : | | | | exit: found key at 234
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12821,7 +12821,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 19  tt_time: 773020818  offset: 19
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 234  int_keypos: 145350300
+T@1    : | | | | enter: nextflag: 8  lastpos: 234  int_keypos: 145350324
 T@1    : | | | | exit: found key at 247
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12831,7 +12831,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 20  tt_time: 820454419  offset: 20
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 247  int_keypos: 145350314
+T@1    : | | | | enter: nextflag: 8  lastpos: 247  int_keypos: 145350338
 T@1    : | | | | exit: found key at 260
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12841,7 +12841,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 21  tt_time: 867715220  offset: 21
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 260  int_keypos: 145350328
+T@1    : | | | | enter: nextflag: 8  lastpos: 260  int_keypos: 145350352
 T@1    : | | | | exit: found key at 273
 T@1    : | | | <_mi_search_next
 T@1    : | | | >my_pread
@@ -12851,7 +12851,7 @@
 T@1    : | | info: time_zone_leap_second table: tz_leapcnt: 22  tt_time: 915148821  offset: 22
 T@1    : | | >mi_rnext
 T@1    : | | | >_mi_search_next
-T@1    : | | | | enter: nextflag: 8  lastpos: 273  int_keypos: 145350342
+T@1    : | | | | enter: nextflag: 8  lastpos: 273  int_keypos: 145350366
 T@1    : | | | <_mi_search_next
 T@1    : | | | >_mi_search
 T@1    : | | | | enter: pos: 1024  nextflag: 40  lastpos: 273
@@ -13757,7 +13757,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -13998,7 +13998,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 78
+T@1    : | | | | | | | | | | | | enter: Size: 80
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 16
@@ -14366,7 +14366,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -14599,7 +14599,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 79
+T@1    : | | | | | | | | | | | | enter: Size: 81
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 18
@@ -14647,7 +14647,7 @@
 T@1    : | | | | | | | | | | <my_read
 T@1    : | | | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 1624
+T@1    : | | | | | | | | | | | | enter: Size: 1632
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | <my_multi_malloc
@@ -15198,7 +15198,7 @@
 T@1    : | | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | | >_mymalloc
@@ -15439,7 +15439,7 @@
 T@1    : | | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | | enter: Size: 77
+T@1    : | | | | | | | | | | | | | enter: Size: 79
 T@1    : | | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | | exit: fd: 20
@@ -16222,7 +16222,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -16467,7 +16467,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 74
+T@1    : | | | | | | | | | | | | enter: Size: 76
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 22
@@ -17245,7 +17245,7 @@
 T@1    : | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | >_mymalloc
@@ -17446,7 +17446,7 @@
 T@1    : | | | | | | | | | <my_open
 T@1    : | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | enter: Size: 71
+T@1    : | | | | | | | | | | | enter: Size: 73
 T@1    : | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | exit: fd: 24
@@ -17494,7 +17494,7 @@
 T@1    : | | | | | | | | | <my_read
 T@1    : | | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | enter: Size: 1368
+T@1    : | | | | | | | | | | | enter: Size: 1376
 T@1    : | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | <my_multi_malloc
@@ -18791,7 +18791,7 @@
 T@1    : | | | | | | | | | | | | >plugin_find_internal
 T@1    : | | | | | | | | | | | | <plugin_find_internal
 T@1    : | | | | | | | | | | | | >my_hash_first
-T@1    : | | | | | | | | | | | | | exit: found key at 7
+T@1    : | | | | | | | | | | | | | exit: found key at 2
 T@1    : | | | | | | | | | | | | <my_hash_first
 T@1    : | | | | | | | | | | | | >intern_plugin_lock
 T@1    : | | | | | | | | | | | | | >_mymalloc
@@ -19168,7 +19168,7 @@
 T@1    : | | | | | | | | | | <my_open
 T@1    : | | | | | | | | | | >my_register_filename
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 72
+T@1    : | | | | | | | | | | | | enter: Size: 74
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | | exit: fd: 24
@@ -19216,7 +19216,7 @@
 T@1    : | | | | | | | | | | <my_read
 T@1    : | | | | | | | | | | >my_multi_malloc
 T@1    : | | | | | | | | | | | >_mymalloc
-T@1    : | | | | | | | | | | | | enter: Size: 2000
+T@1    : | | | | | | | | | | | | enter: Size: 2008
 T@1    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@1    : | | | | | | | | | | | <_mymalloc
 T@1    : | | | | | | | | | | <my_multi_malloc
@@ -20906,5 +20906,5 @@
 T@1    : | >my_once_free
 T@1    : | <my_once_free
 T@1    : | >TERMINATE
-T@1    : | | safe: Maximum memory usage: 1896331 bytes (1852k)
+T@1    : | | safe: Maximum memory usage: 1896407 bytes (1852k)
 T@1    : | <TERMINATE
--- bad.2	2008-11-05 09:57:00.000000000 +0100
+++ good.2	2008-11-05 09:57:01.000000000 +0100
@@ -9,7 +9,7 @@
 T@2    : | | my: Name: '/home/sven/bzr/debug-max/5.1/mysql-test/var/run/master.pid' CreateFlags: 436  AccessFlags: 513  MyFlags: 16
 T@2    : | | >my_register_filename
 T@2    : | | | >_mymalloc
-T@2    : | | | | enter: Size: 59
+T@2    : | | | | enter: Size: 61
 T@2    : | | | | exit: ptr: 0xHEX
 T@2    : | | | <_mymalloc
 T@2    : | | | exit: fd: 10
@@ -32,3 +32,4 @@
 T@2    : | | <vprint_msg_to_log
 T@2    : | <sql_print_information
 T@2    : | info: Got signal: 15  abort_loop: 0
+T@2    : | quit: signal_handler: calling my_thread_end()
--- bad.3	2008-11-05 09:57:00.000000000 +0100
+++ good.3	2008-11-05 09:57:02.000000000 +0100
@@ -1155,9 +1155,9 @@
 T@3    : | | | | | | | | >create_tmp_table
 T@3    : | | | | | | | | | enter: distinct: 0  save_sum_fields: 0  rows_limit: 4294967295  group: 0
 T@3    : | | | | | | | | | >fn_format
-T@3    : | | | | | | | | | | enter: name: #sql_4126_0  dir: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp  extension:   flag: 6
+T@3    : | | | | | | | | | | enter: name: #sql_41bd_0  dir: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp  extension:   flag: 6
 T@3    : | | | | | | | | | | >dirname_part
-T@3    : | | | | | | | | | | | enter: '#sql_4126_0'
+T@3    : | | | | | | | | | | | enter: '#sql_41bd_0'
 T@3    : | | | | | | | | | | | >convert_dirname
 T@3    : | | | | | | | | | | | <convert_dirname
 T@3    : | | | | | | | | | | <dirname_part
@@ -1197,7 +1197,7 @@
 T@3    : | | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | | <alloc_root
 T@3    : | | | | | | | | | >init_tmp_table_share
-T@3    : | | | | | | | | | | enter: table: ''.'/home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_4126_0'
+T@3    : | | | | | | | | | | enter: table: ''.'/home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_41bd_0'
 T@3    : | | | | | | | | | | >init_alloc_root
 T@3    : | | | | | | | | | | | enter: root: 0xHEX
 T@3    : | | | | | | | | | | <init_alloc_root
@@ -1243,7 +1243,7 @@
 T@3    : | | | | | | | | | >bitmap_init
 T@3    : | | | | | | | | | <bitmap_init
 T@3    : | | | | | | | | | >handler::ha_open
-T@3    : | | | | | | | | | | enter: name: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_4126_0  db_type: 6  db_stat: 3  mode: 2  lock_test: 516
+T@3    : | | | | | | | | | | enter: name: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_41bd_0  db_type: 6  db_stat: 3  mode: 2  lock_test: 516
 T@3    : | | | | | | | | | | >_mymalloc
 T@3    : | | | | | | | | | | | enter: Size: 0
 T@3    : | | | | | | | | | | | exit: ptr: 0xHEX
@@ -1255,7 +1255,7 @@
 T@3    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | | | | <_mymalloc
 T@3    : | | | | | | | | | | | >_mymalloc
-T@3    : | | | | | | | | | | | | enter: Size: 60
+T@3    : | | | | | | | | | | | | enter: Size: 62
 T@3    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | | | | <_mymalloc
 T@3    : | | | | | | | | | | | >thr_lock_init
@@ -3558,7 +3558,7 @@
 T@3    : | | | | >plugin_find_internal
 T@3    : | | | | <plugin_find_internal
 T@3    : | | | | >my_hash_first
-T@3    : | | | | | exit: found key at 7
+T@3    : | | | | | exit: found key at 2
 T@3    : | | | | <my_hash_first
 T@3    : | | | | >intern_plugin_lock
 T@3    : | | | | | >_mymalloc
@@ -3968,7 +3968,7 @@
 T@3    : | | | | | | | | | | | >plugin_find_internal
 T@3    : | | | | | | | | | | | <plugin_find_internal
 T@3    : | | | | | | | | | | | >my_hash_first
-T@3    : | | | | | | | | | | | | exit: found key at 7
+T@3    : | | | | | | | | | | | | exit: found key at 2
 T@3    : | | | | | | | | | | | <my_hash_first
 T@3    : | | | | | | | | | | | >intern_plugin_lock
 T@3    : | | | | | | | | | | | | >_mymalloc
@@ -4167,7 +4167,7 @@
 T@3    : | | | | | | | | | | | | my: Name: '/home/sven/bzr/debug-max/5.1/mysql-test/var/master-data/test/t1.MYI' CreateFlags: 0  AccessFlags: 514  MyFlags: 272
 T@3    : | | | | | | | | | | | | >my_register_filename
 T@3    : | | | | | | | | | | | | | >_mymalloc
-T@3    : | | | | | | | | | | | | | | enter: Size: 68
+T@3    : | | | | | | | | | | | | | | enter: Size: 70
 T@3    : | | | | | | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | | | | | | <_mymalloc
 T@3    : | | | | | | | | | | | | | exit: fd: 30
@@ -4321,7 +4321,7 @@
 T@3    : | | | | | | | | | <_mymalloc
 T@3    : | | | | | | | | | >open_cached_file
 T@3    : | | | | | | | | | | >_mymalloc
-T@3    : | | | | | | | | | | | enter: Size: 48
+T@3    : | | | | | | | | | | | enter: Size: 50
 T@3    : | | | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | | | <_mymalloc
 T@3    : | | | | | | | | | | >_mymalloc
@@ -4891,7 +4891,7 @@
 T@3    : | | | | | | | | | | | | | | >plugin_find_internal
 T@3    : | | | | | | | | | | | | | | <plugin_find_internal
 T@3    : | | | | | | | | | | | | | | >my_hash_first
-T@3    : | | | | | | | | | | | | | | | exit: found key at 7
+T@3    : | | | | | | | | | | | | | | | exit: found key at 2
 T@3    : | | | | | | | | | | | | | | <my_hash_first
 T@3    : | | | | | | | | | | | | | | >intern_plugin_lock
 T@3    : | | | | | | | | | | | | | | | >_mymalloc
@@ -5049,7 +5049,7 @@
 T@3    : | | | | | | | | | | | | <my_open
 T@3    : | | | | | | | | | | | | >my_register_filename
 T@3    : | | | | | | | | | | | | | >_mymalloc
-T@3    : | | | | | | | | | | | | | | enter: Size: 68
+T@3    : | | | | | | | | | | | | | | enter: Size: 70
 T@3    : | | | | | | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | | | | | | <_mymalloc
 T@3    : | | | | | | | | | | | | | exit: fd: 30
@@ -5318,8 +5318,9 @@
 T@3    : | | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | | <check_locks
 T@3    : | | | | | | | | | | info: write_wait.data: 0xHEX
+T@3    : | | | | | | | | | | info: dellink: -1  r_locks: 0  w_locks: 1
 T@3    : | | | | | | | | | | >mi_get_status
-T@3    : | | | | | | | | | | | info: key_file: 1024  data_file: 0  concurrent_insert: 0
+T@3    : | | | | | | | | | | | info: key_file: 1024  data_file: 0  concurrent_insert: 1
 T@3    : | | | | | | | | | | <mi_get_status
 T@3    : | | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | | <check_locks
@@ -5604,16 +5605,6 @@
 T@3    : | <vio_is_blocking
 T@3    : | >vio_read
 T@3    : | | enter: sd: 26  buf: 0xHEX  size: 4
-T@3    : | | vio_error: Got error 11 during read
-T@3    : | | exit: -1
-T@3    : | <vio_read
-T@3    : | info: vio_read returned -1  errno: 11
-T@3    : | >vio_blocking
-T@3    : | | enter: set_blocking_mode: 1  old_mode: 0
-T@3    : | | exit: 0
-T@3    : | <vio_blocking
-T@3    : | >vio_read
-T@3    : | | enter: sd: 26  buf: 0xHEX  size: 4
 T@3    : | | exit: 4
 T@3    : | <vio_read
 T@3    : | packet_header: Memory: 0xHEX  Bytes: (4)
@@ -5621,10 +5612,6 @@
 T@3    : | | enter: sd: 26  buf: 0xHEX  size: 32
 T@3    : | | exit: 32
 T@3    : | <vio_read
-T@3    : | >vio_blocking
-T@3    : | | enter: set_blocking_mode: 0  old_mode: 1
-T@3    : | | exit: 0
-T@3    : | <vio_blocking
 T@3    : | >PROFILING::start_new_query
 T@3    : | <PROFILING::start_new_query
 T@3    : | info: Command on socket (26) = 3 (Query)
@@ -6217,8 +6204,9 @@
 T@3    : | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | <check_locks
 T@3    : | | | | | | | | | info: write_wait.data: 0xHEX
+T@3    : | | | | | | | | | info: dellink: -1  r_locks: 1  w_locks: 1
 T@3    : | | | | | | | | | >mi_get_status
-T@3    : | | | | | | | | | | info: key_file: 1024  data_file: 7  concurrent_insert: 0
+T@3    : | | | | | | | | | | info: key_file: 1024  data_file: 7  concurrent_insert: 1
 T@3    : | | | | | | | | | <mi_get_status
 T@3    : | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | <check_locks
@@ -6227,7 +6215,7 @@
 T@3    : | | | | | | | | | lock: data: 0xHEX  thread: 0xHEX  lock: 0xHEX  type: 5
 T@3    : | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | <check_locks
-T@3    : | | | | | | | | | info: write_wait.data: 0xHEX  old_type: 8
+T@3    : | | | | | | | | | lock: write locked 1 by thread: 0xHEX
 T@3    : | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | <check_locks
 T@3    : | | | | | | | | | >mi_get_status
@@ -6650,6 +6638,7 @@
 T@3    : | | | | | | lock: data: 0xHEX  thread: 0xHEX  lock: 0xHEX
 T@3    : | | | | | | >check_locks
 T@3    : | | | | | | <check_locks
+T@3    : | | | | | | info: updating status:  key_file: 1024  data_file: 14
 T@3    : | | | | | | >check_locks
 T@3    : | | | | | | <check_locks
 T@3    : | | | | | | >wake_up_waiters
@@ -7075,7 +7064,7 @@
 T@3    : | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | <check_locks
 T@3    : | | | | | | | | | >mi_get_status
-T@3    : | | | | | | | | | | info: key_file: 1024  data_file: 7  concurrent_insert: 0
+T@3    : | | | | | | | | | | info: key_file: 1024  data_file: 14  concurrent_insert: 0
 T@3    : | | | | | | | | | <mi_get_status
 T@3    : | | | | | | | | | >check_locks
 T@3    : | | | | | | | | | <check_locks
@@ -7195,76 +7184,27 @@
 T@3    : | | | | | | | | <alloc_root
 T@3    : | | | | | | | | >mi_status
 T@3    : | | | | | | | | <mi_status
-T@3    : | | | | | | | | >join_read_const_table
-T@3    : | | | | | | | | | >handler::read_first_row
-T@3    : | | | | | | | | | | >ha_rnd_init
-T@3    : | | | | | | | | | | | >mi_scan_init
-T@3    : | | | | | | | | | | | <mi_scan_init
-T@3    : | | | | | | | | | | <ha_rnd_init
-T@3    : | | | | | | | | | | >mi_scan
-T@3    : | | | | | | | | | | <mi_scan
-T@3    : | | | | | | | | | | >_mi_read_rnd_static_record
-T@3    : | | | | | | | | | | | >my_pread
-T@3    : | | | | | | | | | | | | my: Fd: 32  Seek: 0  Buffer: 0xHEX  Count: 5  MyFlags: 4
-T@3    : | | | | | | | | | | | <my_pread
-T@3    : | | | | | | | | | | <_mi_read_rnd_static_record
-T@3    : | | | | | | | | | | >ha_rnd_end
-T@3    : | | | | | | | | | | <ha_rnd_end
-T@3    : | | | | | | | | | <handler::read_first_row
-T@3    : | | | | | | | | <join_read_const_table
+T@3    : | | | | | | | | >choose_plan
+T@3    : | | | | | | | | | >reset_nj_counters
+T@3    : | | | | | | | | | <reset_nj_counters
+T@3    : | | | | | | | | | >greedy_search
+T@3    : | | | | | | | | | | >best_extension_by_limited_search
+T@3    : | | | | | | | | | | | >best_access_path
+T@3    : | | | | | | | | | | | <best_access_path
+T@3    : | | | | | | | | | | <best_extension_by_limited_search
+T@3    : | | | | | | | | | <greedy_search
+T@3    : | | | | | | | | <choose_plan
 T@3    : | | | | | | | <make_join_statistics
 T@3    : | | | | | | | >get_best_combination
 T@3    : | | | | | | | | >alloc_root
 T@3    : | | | | | | | | | enter: root: 0xHEX
 T@3    : | | | | | | | | | exit: ptr: 0xHEX
 T@3    : | | | | | | | | <alloc_root
-T@3    : | | | | | | | | info: type: 1
+T@3    : | | | | | | | | info: type: 0
 T@3    : | | | | | | | <get_best_combination
 T@3    : | | | | | | | proc_info: sql_select.cc:954  preparing
 T@3    : | | | | | | | >PROFILING::status_change
 T@3    : | | | | | | | <PROFILING::status_change
-T@3    : | | | | | | | >get_lock_data
-T@3    : | | | | | | | | info: count 1
-T@3    : | | | | | | | | >_mymalloc
-T@3    : | | | | | | | | | enter: Size: 28
-T@3    : | | | | | | | | | exit: ptr: 0xHEX
-T@3    : | | | | | | | | <_mymalloc
-T@3    : | | | | | | | | info: sql_lock->table_count 1 sql_lock->lock_count 1
-T@3    : | | | | | | | <get_lock_data
-T@3    : | | | | | | | >mysql_unlock_tables
-T@3    : | | | | | | | | >thr_multi_unlock
-T@3    : | | | | | | | | | lock: data: 0xHEX  count: 1
-T@3    : | | | | | | | | | >thr_unlock
-T@3    : | | | | | | | | | | lock: data: 0xHEX  thread: 0xHEX  lock: 0xHEX
-T@3    : | | | | | | | | | | >check_locks
-T@3    : | | | | | | | | | | <check_locks
-T@3    : | | | | | | | | | | >check_locks
-T@3    : | | | | | | | | | | <check_locks
-T@3    : | | | | | | | | | | >wake_up_waiters
-T@3    : | | | | | | | | | | | lock: No waiting read locks to free
-T@3    : | | | | | | | | | | | >check_locks
-T@3    : | | | | | | | | | | | <check_locks
-T@3    : | | | | | | | | | | <wake_up_waiters
-T@3    : | | | | | | | | | <thr_unlock
-T@3    : | | | | | | | | <thr_multi_unlock
-T@3    : | | | | | | | | >unlock_external
-T@3    : | | | | | | | | | >handler::ha_external_lock
-T@3    : | | | | | | | | | | >mi_lock_database
-T@3    : | | | | | | | | | | | enter: lock_type: 2  old lock 0  r_locks: 1  w_locks: 0 global_changed:  1  open_count: 1  name: './test/t1.MYI'
-T@3    : | | | | | | | | | | | >free_root
-T@3    : | | | | | | | | | | | | enter: root: 0xHEX  flags: 0
-T@3    : | | | | | | | | | | | <free_root
-T@3    : | | | | | | | | | | | info: changed: 0  w_locks: 0
-T@3    : | | | | | | | | | | | >my_lock
-T@3    : | | | | | | | | | | | | my: Fd: 30  Op: 2  start: 0  Length: 0  MyFlags: 48
-T@3    : | | | | | | | | | | | <my_lock
-T@3    : | | | | | | | | | | <mi_lock_database
-T@3    : | | | | | | | | | <handler::ha_external_lock
-T@3    : | | | | | | | | <unlock_external
-T@3    : | | | | | | | | >_myfree
-T@3    : | | | | | | | | | enter: ptr: 0xHEX
-T@3    : | | | | | | | | <_myfree
-T@3    : | | | | | | | <mysql_unlock_tables
 T@3    : | | | | | | | >make_select
 T@3    : | | | | | | | | >alloc_root
 T@3    : | | | | | | | | | enter: root: 0xHEX
@@ -7278,7 +7218,17 @@
 T@3    : | | | | | | | >make_join_select
 T@3    : | | | | | | | | >add_not_null_conds
 T@3    : | | | | | | | | <add_not_null_conds
+T@3    : | | | | | | | | >alloc_root
+T@3    : | | | | | | | | | enter: root: 0xHEX
+T@3    : | | | | | | | | | exit: ptr: 0xHEX
+T@3    : | | | | | | | | <alloc_root
 T@3    : | | | | | | | <make_join_select
+T@3    : | | | | | | | >remove_const
+T@3    : | | | | | | | | exit: simple_order: 1
+T@3    : | | | | | | | <remove_const
+T@3    : | | | | | | | >remove_const
+T@3    : | | | | | | | | exit: simple_order: 1
+T@3    : | | | | | | | <remove_const
 T@3    : | | | | | | | >make_join_readinfo
 T@3    : | | | | | | | <make_join_readinfo
 T@3    : | | | | | | | >TEST_join
@@ -7304,6 +7254,46 @@
 T@3    : | | | | | | | | packet_header: Memory: 0xHEX  Bytes: (4)
 T@3    : | | | | | | | <send_fields
 T@3    : | | | | | | | >do_select
+T@3    : | | | | | | | | >init_read_record
+T@3    : | | | | | | | | | info: using rr_sequential
+T@3    : | | | | | | | | | >ha_rnd_init
+T@3    : | | | | | | | | | | >mi_scan_init
+T@3    : | | | | | | | | | | <mi_scan_init
+T@3    : | | | | | | | | | <ha_rnd_init
+T@3    : | | | | | | | | | >mi_extra
+T@3    : | | | | | | | | | | enter: function: 3
+T@3    : | | | | | | | | | | >init_io_cache
+T@3    : | | | | | | | | | | | enter: cache: 0xHEX  type: 1  pos: 0
+T@3    : | | | | | | | | | | | >my_tell
+T@3    : | | | | | | | | | | | | my: Fd: 32  MyFlags: 0
+T@3    : | | | | | | | | | | | | exit: pos: 0
+T@3    : | | | | | | | | | | | <my_tell
+T@3    : | | | | | | | | | | | >my_seek
+T@3    : | | | | | | | | | | | | my: Fd: 32  Hpos: 0  Pos: 0  Whence: 2  MyFlags: 0
+T@3    : | | | | | | | | | | | | exit: pos: 14
+T@3    : | | | | | | | | | | | <my_seek
+T@3    : | | | | | | | | | | | >_mymalloc
+T@3    : | | | | | | | | | | | | enter: Size: 16384
+T@3    : | | | | | | | | | | | | exit: ptr: 0xHEX
+T@3    : | | | | | | | | | | | <_mymalloc
+T@3    : | | | | | | | | | | | info: init_io_cache: cachesize = 16384
+T@3    : | | | | | | | | | | <init_io_cache
+T@3    : | | | | | | | | | <mi_extra
+T@3    : | | | | | | | | <init_read_record
+T@3    : | | | | | | | | >mi_scan
+T@3    : | | | | | | | | <mi_scan
+T@3    : | | | | | | | | >_mi_read_rnd_static_record
+T@3    : | | | | | | | | | >_my_b_read
+T@3    : | | | | | | | | | | >my_seek
+T@3    : | | | | | | | | | | | my: Fd: 32  Hpos: 0  Pos: 0  Whence: 0  MyFlags: 0
+T@3    : | | | | | | | | | | <my_seek
+T@3    : | | | | | | | | | | >my_read
+T@3    : | | | | | | | | | | | my: Fd: 32  Buffer: 0xHEX  Count: 14  MyFlags: 32
+T@3    : | | | | | | | | | | <my_read
+T@3    : | | | | | | | | | <_my_b_read
+T@3    : | | | | | | | | <_mi_read_rnd_static_record
+T@3    : | | | | | | | | info: select cond 0xHEX
+T@3    : | | | | | | | | counts: join->examined_rows++: 1
 T@3    : | | | | | | | | >end_send
 T@3    : | | | | | | | | | >select_send::send_data
 T@3    : | | | | | | | | | <select_send::send_data
@@ -7311,20 +7301,79 @@
 T@3    : | | | | | | | | | <Protocol::write
 T@3    : | | | | | | | | | packet_header: Memory: 0xHEX  Bytes: (4)
 T@3    : | | | | | | | | <end_send
+T@3    : | | | | | | | | >mi_scan
+T@3    : | | | | | | | | <mi_scan
+T@3    : | | | | | | | | >_mi_read_rnd_static_record
+T@3    : | | | | | | | | <_mi_read_rnd_static_record
+T@3    : | | | | | | | | info: select cond 0xHEX
+T@3    : | | | | | | | | counts: join->examined_rows++: 2
+T@3    : | | | | | | | | >end_send
+T@3    : | | | | | | | | | >select_send::send_data
+T@3    : | | | | | | | | | <select_send::send_data
+T@3    : | | | | | | | | | >Protocol::write
+T@3    : | | | | | | | | | <Protocol::write
+T@3    : | | | | | | | | | packet_header: Memory: 0xHEX  Bytes: (4)
+T@3    : | | | | | | | | <end_send
+T@3    : | | | | | | | | >mi_scan
+T@3    : | | | | | | | | <mi_scan
+T@3    : | | | | | | | | >_mi_read_rnd_static_record
+T@3    : | | | | | | | | | test: filepos: 2 (14)  records: 2  del: 0
+T@3    : | | | | | | | | <_mi_read_rnd_static_record
 T@3    : | | | | | | | | >end_send
 T@3    : | | | | | | | | <end_send
 T@3    : | | | | | | | | >JOIN::join_free
 T@3    : | | | | | | | | | >JOIN::cleanup
+T@3    : | | | | | | | | | | >free_io_cache
+T@3    : | | | | | | | | | | <free_io_cache
+T@3    : | | | | | | | | | | >close_cached_file
+T@3    : | | | | | | | | | | <close_cached_file
 T@3    : | | | | | | | | | | >_myfree
 T@3    : | | | | | | | | | | | enter: ptr: (nil)
 T@3    : | | | | | | | | | | <_myfree
+T@3    : | | | | | | | | | | >ha_rnd_end
+T@3    : | | | | | | | | | | <ha_rnd_end
+T@3    : | | | | | | | | | | >mi_extra
+T@3    : | | | | | | | | | | | enter: function: 4
+T@3    : | | | | | | | | | | | >end_io_cache
+T@3    : | | | | | | | | | | | | enter: cache: 0xHEX
+T@3    : | | | | | | | | | | | | >my_b_flush_io_cache
+T@3    : | | | | | | | | | | | | | enter: cache: 0xHEX
+T@3    : | | | | | | | | | | | | <my_b_flush_io_cache
+T@3    : | | | | | | | | | | | | >_myfree
+T@3    : | | | | | | | | | | | | | enter: ptr: 0xHEX
+T@3    : | | | | | | | | | | | | <_myfree
+T@3    : | | | | | | | | | | | <end_io_cache
+T@3    : | | | | | | | | | | <mi_extra
 T@3    : | | | | | | | | | <JOIN::cleanup
 T@3    : | | | | | | | | | >mysql_unlock_read_tables
 T@3    : | | | | | | | | | | >thr_multi_unlock
 T@3    : | | | | | | | | | | | lock: data: 0xHEX  count: 1
-T@3    : | | | | | | | | | | | lock: Free lock: data: 0xHEX  thread: 0xHEX  lock: 0xHEX
+T@3    : | | | | | | | | | | | >thr_unlock
+T@3    : | | | | | | | | | | | | lock: data: 0xHEX  thread: 0xHEX  lock: 0xHEX
+T@3    : | | | | | | | | | | | | >check_locks
+T@3    : | | | | | | | | | | | | <check_locks
+T@3    : | | | | | | | | | | | | >check_locks
+T@3    : | | | | | | | | | | | | <check_locks
+T@3    : | | | | | | | | | | | | >wake_up_waiters
+T@3    : | | | | | | | | | | | | | lock: No waiting read locks to free
+T@3    : | | | | | | | | | | | | | >check_locks
+T@3    : | | | | | | | | | | | | | <check_locks
+T@3    : | | | | | | | | | | | | <wake_up_waiters
+T@3    : | | | | | | | | | | | <thr_unlock
 T@3    : | | | | | | | | | | <thr_multi_unlock
 T@3    : | | | | | | | | | | >unlock_external
+T@3    : | | | | | | | | | | | >handler::ha_external_lock
+T@3    : | | | | | | | | | | | | >mi_lock_database
+T@3    : | | | | | | | | | | | | | enter: lock_type: 2  old lock 0  r_locks: 1  w_locks: 0 global_changed:  1  open_count: 1  name: './test/t1.MYI'
+T@3    : | | | | | | | | | | | | | >free_root
+T@3    : | | | | | | | | | | | | | | enter: root: 0xHEX  flags: 0
+T@3    : | | | | | | | | | | | | | <free_root
+T@3    : | | | | | | | | | | | | | info: changed: 0  w_locks: 0
+T@3    : | | | | | | | | | | | | | >my_lock
+T@3    : | | | | | | | | | | | | | | my: Fd: 30  Op: 2  start: 0  Length: 0  MyFlags: 48
+T@3    : | | | | | | | | | | | | | <my_lock
+T@3    : | | | | | | | | | | | | <mi_lock_database
+T@3    : | | | | | | | | | | | <handler::ha_external_lock
 T@3    : | | | | | | | | | | <unlock_external
 T@3    : | | | | | | | | | <mysql_unlock_read_tables
 T@3    : | | | | | | | | <JOIN::join_free
@@ -7333,9 +7382,9 @@
 T@3    : | | | | | | | | | | enter: ptr: 0xHEX
 T@3    : | | | | | | | | | <_myfree
 T@3    : | | | | | | | | <mysql_unlock_tables
-T@3    : | | | | | | | | info: 1 records output
+T@3    : | | | | | | | | info: 2 records output
 T@3    : | | | | | | | <do_select
-T@3    : | | | | | | | counts: thd->examined_row_count: 1
+T@3    : | | | | | | | counts: thd->examined_row_count: 2
 T@3    : | | | | | | <JOIN::exec
 T@3    : | | | | | | proc_info: sql_select.cc:2382  end
 T@3    : | | | | | | >PROFILING::status_change
@@ -7395,8 +7444,8 @@
 T@3    : | | | | | >query_cache_insert
 T@3    : | | | | | <query_cache_insert
 T@3    : | | | | | >vio_write
-T@3    : | | | | | | enter: sd: 26  buf: 0xHEX  size: 65
-T@3    : | | | | | | exit: 65
+T@3    : | | | | | | enter: sd: 26  buf: 0xHEX  size: 71
+T@3    : | | | | | | exit: 71
 T@3    : | | | | | <vio_write
 T@3    : | | | | <net_real_write
 T@3    : | | | <net_flush
--- bad.4	2008-11-05 09:57:00.000000000 +0100
+++ good.4	2008-11-05 09:57:02.000000000 +0100
@@ -273,16 +273,6 @@
 T@4    : | <vio_is_blocking
 T@4    : | >vio_read
 T@4    : | | enter: sd: 26  buf: 0xHEX  size: 4
-T@4    : | | vio_error: Got error 11 during read
-T@4    : | | exit: -1
-T@4    : | <vio_read
-T@4    : | info: vio_read returned -1  errno: 11
-T@4    : | >vio_blocking
-T@4    : | | enter: set_blocking_mode: 1  old_mode: 0
-T@4    : | | exit: 0
-T@4    : | <vio_blocking
-T@4    : | >vio_read
-T@4    : | | enter: sd: 26  buf: 0xHEX  size: 4
 T@4    : | | exit: 4
 T@4    : | <vio_read
 T@4    : | packet_header: Memory: 0xHEX  Bytes: (4)
@@ -290,10 +280,6 @@
 T@4    : | | enter: sd: 26  buf: 0xHEX  size: 31
 T@4    : | | exit: 31
 T@4    : | <vio_read
-T@4    : | >vio_blocking
-T@4    : | | enter: set_blocking_mode: 0  old_mode: 1
-T@4    : | | exit: 0
-T@4    : | <vio_blocking
 T@4    : | >PROFILING::start_new_query
 T@4    : | <PROFILING::start_new_query
 T@4    : | info: Command on socket (26) = 3 (Query)
@@ -616,9 +602,9 @@
 T@4    : | | | | | | | | >create_tmp_table
 T@4    : | | | | | | | | | enter: distinct: 0  save_sum_fields: 0  rows_limit: 4294967295  group: 0
 T@4    : | | | | | | | | | >fn_format
-T@4    : | | | | | | | | | | enter: name: #sql_4126_0  dir: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp  extension:   flag: 6
+T@4    : | | | | | | | | | | enter: name: #sql_41bd_0  dir: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp  extension:   flag: 6
 T@4    : | | | | | | | | | | >dirname_part
-T@4    : | | | | | | | | | | | enter: '#sql_4126_0'
+T@4    : | | | | | | | | | | | enter: '#sql_41bd_0'
 T@4    : | | | | | | | | | | | >convert_dirname
 T@4    : | | | | | | | | | | | <convert_dirname
 T@4    : | | | | | | | | | | <dirname_part
@@ -658,7 +644,7 @@
 T@4    : | | | | | | | | | | exit: ptr: 0xHEX
 T@4    : | | | | | | | | | <alloc_root
 T@4    : | | | | | | | | | >init_tmp_table_share
-T@4    : | | | | | | | | | | enter: table: ''.'/home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_4126_0'
+T@4    : | | | | | | | | | | enter: table: ''.'/home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_41bd_0'
 T@4    : | | | | | | | | | | >init_alloc_root
 T@4    : | | | | | | | | | | | enter: root: 0xHEX
 T@4    : | | | | | | | | | | <init_alloc_root
@@ -704,7 +690,7 @@
 T@4    : | | | | | | | | | >bitmap_init
 T@4    : | | | | | | | | | <bitmap_init
 T@4    : | | | | | | | | | >handler::ha_open
-T@4    : | | | | | | | | | | enter: name: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_4126_0  db_type: 6  db_stat: 3  mode: 2  lock_test: 516
+T@4    : | | | | | | | | | | enter: name: /home/sven/bzr/debug-max/5.1/mysql-test/var/tmp/#sql_41bd_0  db_type: 6  db_stat: 3  mode: 2  lock_test: 516
 T@4    : | | | | | | | | | | >_mymalloc
 T@4    : | | | | | | | | | | | enter: Size: 0
 T@4    : | | | | | | | | | | | exit: ptr: 0xHEX
@@ -716,7 +702,7 @@
 T@4    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@4    : | | | | | | | | | | | <_mymalloc
 T@4    : | | | | | | | | | | | >_mymalloc
-T@4    : | | | | | | | | | | | | enter: Size: 60
+T@4    : | | | | | | | | | | | | enter: Size: 62
 T@4    : | | | | | | | | | | | | exit: ptr: 0xHEX
 T@4    : | | | | | | | | | | | <_mymalloc
 T@4    : | | | | | | | | | | | >thr_lock_init
@@ -1867,8 +1853,8 @@
 T@4    : | | | | | >query_cache_insert
 T@4    : | | | | | <query_cache_insert
 T@4    : | | | | | >vio_write
-T@4    : | | | | | | enter: sd: 26  buf: 0xHEX  size: 210
-T@4    : | | | | | | exit: 210
+T@4    : | | | | | | enter: sd: 26  buf: 0xHEX  size: 212
+T@4    : | | | | | | exit: 212
 T@4    : | | | | | <vio_write
 T@4    : | | | | <net_real_write
 T@4    : | | | <net_flush
@@ -1969,16 +1955,6 @@
 T@4    : | <vio_is_blocking
 T@4    : | >vio_read
 T@4    : | | enter: sd: 26  buf: 0xHEX  size: 4
-T@4    : | | vio_error: Got error 11 during read
-T@4    : | | exit: -1
-T@4    : | <vio_read
-T@4    : | info: vio_read returned -1  errno: 11
-T@4    : | >vio_blocking
-T@4    : | | enter: set_blocking_mode: 1  old_mode: 0
-T@4    : | | exit: 0
-T@4    : | <vio_blocking
-T@4    : | >vio_read
-T@4    : | | enter: sd: 26  buf: 0xHEX  size: 4
 T@4    : | | exit: 4
 T@4    : | <vio_read
 T@4    : | packet_header: Memory: 0xHEX  Bytes: (4)
@@ -1986,10 +1962,6 @@
 T@4    : | | enter: sd: 26  buf: 0xHEX  size: 2
 T@4    : | | exit: 2
 T@4    : | <vio_read
-T@4    : | >vio_blocking
-T@4    : | | enter: set_blocking_mode: 0  old_mode: 1
-T@4    : | | exit: 0
-T@4    : | <vio_blocking
 T@4    : | >PROFILING::start_new_query
 T@4    : | <PROFILING::start_new_query
 T@4    : | info: Command on socket (26) = 8 (Shutdown)
--- bad.5	2008-11-05 09:57:01.000000000 +0100
+++ good.5	2008-11-05 09:57:02.000000000 +0100
@@ -9,7 +9,6 @@
 T@5    : | >close_connections
 T@5    : | | quit: waiting for select thread: 0xHEX
 T@5    : | | info: Waiting for select thread
-T@5    : | | info: Waiting for select thread
 T@5    : | | quit: Closing sockets
 T@5    : | | >Events::deinit
 T@5    : | | | >Event_scheduler::stop
