1. 27 Jul, 2007 2 commits
    • unknown's avatar
      Fix a bad BitKeeper dependency structure for the "funcs_1" suite: · 28982cf1
      unknown authored
      Step 2:
      Restore the 5.1 contents in the 5.0-dependent files.
      
      
      mysql-test/suite/funcs_1/cursors/cursors_master.test:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/datadict/datadict_master.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_storedproc.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_storedproc.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/memory_views.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_storedproc.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/triggers/triggers_03.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/triggers/triggers_08.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/triggers/triggers_09.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/views/func_view.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      mysql-test/suite/funcs_1/views/views_master.inc:
        Restore the 5.1 contents in the 5.0-dependent file.
      28982cf1
    • unknown's avatar
      Fix a bad BitKeeper dependency structure for the "funcs_1" suite: · a3544df5
      unknown authored
      The files below "mysql-test/suite/funcs_1" in version 5.1
      did not depend on the equivalent ones in 5.0,
      probably because they had been checked in independent of each other
      in both versions.
      
      Step 1:
      Foreach file F in the suite that has a "deleted" counterpart D, use
          bk rm $F
          bk mv $D $F
      to get those files into the 5.1 suite that (for BK) depend on 5.0.
      
      
      BitKeeper/deleted/.del-bitdata_master.test~6c37e095e0a9add9:
        Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
      BitKeeper/deleted/.del-cursors_master.test~9dcdbd03ab922cc0:
        Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
      mysql-test/suite/funcs_1/bitdata/bitdata_master.test:
        Rename: BitKeeper/deleted/.del-bitdata_master.test -> mysql-test/suite/funcs_1/bitdata/bitdata_master.test
      BitKeeper/deleted/.del-innodb_tb1.txt~7aac0fc74aa9562b:
        Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
      BitKeeper/deleted/.del-innodb_tb2.txt~9e942b8278568a29:
        Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
      mysql-test/suite/funcs_1/cursors/cursors_master.test:
        Rename: BitKeeper/deleted/.del-cursors_master.test -> mysql-test/suite/funcs_1/cursors/cursors_master.test
      mysql-test/suite/funcs_1/data/innodb_tb1.txt:
        Rename: BitKeeper/deleted/.del-innodb_tb1.txt -> mysql-test/suite/funcs_1/data/innodb_tb1.txt
      mysql-test/suite/funcs_1/data/innodb_tb2.txt:
        Rename: BitKeeper/deleted/.del-innodb_tb2.txt -> mysql-test/suite/funcs_1/data/innodb_tb2.txt
      BitKeeper/deleted/.del-innodb_tb3.txt~2799425a5cda8773:
        Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
      BitKeeper/deleted/.del-innodb_tb4.txt~4944d7e7a6e18007:
        Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
      mysql-test/suite/funcs_1/data/innodb_tb3.txt:
        Rename: BitKeeper/deleted/.del-innodb_tb3.txt -> mysql-test/suite/funcs_1/data/innodb_tb3.txt
      mysql-test/suite/funcs_1/data/innodb_tb4.txt:
        Rename: BitKeeper/deleted/.del-innodb_tb4.txt -> mysql-test/suite/funcs_1/data/innodb_tb4.txt
      BitKeeper/deleted/.del-memory_tb1.txt~6132f28bde92b74d:
        Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
      BitKeeper/deleted/.del-memory_tb2.txt~e989d4cca5cc4383:
        Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
      BitKeeper/deleted/.del-memory_tb3.txt~41d0c3a6f93c7943:
        Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
      mysql-test/suite/funcs_1/data/memory_tb1.txt:
        Rename: BitKeeper/deleted/.del-memory_tb1.txt -> mysql-test/suite/funcs_1/data/memory_tb1.txt
      mysql-test/suite/funcs_1/data/memory_tb2.txt:
        Rename: BitKeeper/deleted/.del-memory_tb2.txt -> mysql-test/suite/funcs_1/data/memory_tb2.txt
      mysql-test/suite/funcs_1/data/memory_tb3.txt:
        Rename: BitKeeper/deleted/.del-memory_tb3.txt -> mysql-test/suite/funcs_1/data/memory_tb3.txt
      BitKeeper/deleted/.del-memory_tb4.txt~c2e1ba0cb221343c:
        Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
      BitKeeper/deleted/.del-myisam_tb1.txt~7f1338ea22ef2ddd:
        Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
      mysql-test/suite/funcs_1/data/memory_tb4.txt:
        Rename: BitKeeper/deleted/.del-memory_tb4.txt -> mysql-test/suite/funcs_1/data/memory_tb4.txt
      mysql-test/suite/funcs_1/data/myisam_tb1.txt:
        Rename: BitKeeper/deleted/.del-myisam_tb1.txt -> mysql-test/suite/funcs_1/data/myisam_tb1.txt
      BitKeeper/deleted/.del-myisam_tb2.txt~274fcaf6c68cd806:
        Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
      BitKeeper/deleted/.del-myisam_tb3.txt~79980a26498bc43:
        Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
      BitKeeper/deleted/.del-myisam_tb4.txt~f6911545af0083a1:
        Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
      mysql-test/suite/funcs_1/data/myisam_tb2.txt:
        Rename: BitKeeper/deleted/.del-myisam_tb2.txt -> mysql-test/suite/funcs_1/data/myisam_tb2.txt
      mysql-test/suite/funcs_1/data/myisam_tb3.txt:
        Rename: BitKeeper/deleted/.del-myisam_tb3.txt -> mysql-test/suite/funcs_1/data/myisam_tb3.txt
      BitKeeper/deleted/.del-t3.txt~6ae31465f2e71150:
        Delete: mysql-test/suite/funcs_1/data/t3.txt
      BitKeeper/deleted/.del-t4.txt~ea4aa3bb29a89198:
        Delete: mysql-test/suite/funcs_1/data/t4.txt
      mysql-test/suite/funcs_1/data/myisam_tb4.txt:
        Rename: BitKeeper/deleted/.del-myisam_tb4.txt -> mysql-test/suite/funcs_1/data/myisam_tb4.txt
      mysql-test/suite/funcs_1/data/t3.txt:
        Rename: BitKeeper/deleted/.del-t3.txt -> mysql-test/suite/funcs_1/data/t3.txt
      mysql-test/suite/funcs_1/data/t4.txt:
        Rename: BitKeeper/deleted/.del-t4.txt -> mysql-test/suite/funcs_1/data/t4.txt
      BitKeeper/deleted/.del-datadict_bug_12777.inc~672dfea7d7dba2b8:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
      BitKeeper/deleted/.del-t7.txt~eede0d702e02d5bf:
        Delete: mysql-test/suite/funcs_1/data/t7.txt
      BitKeeper/deleted/.del-t9.txt~3df18021c8994cfa:
        Delete: mysql-test/suite/funcs_1/data/t9.txt
      mysql-test/suite/funcs_1/data/t7.txt:
        Rename: BitKeeper/deleted/.del-t7.txt -> mysql-test/suite/funcs_1/data/t7.txt
      mysql-test/suite/funcs_1/data/t9.txt:
        Rename: BitKeeper/deleted/.del-t9.txt -> mysql-test/suite/funcs_1/data/t9.txt
      BitKeeper/deleted/.del-datadict_load.inc~ff1ec79eab8c431c:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
      BitKeeper/deleted/.del-datadict_master.inc~94ae7b735ad01d72:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
      mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
        Rename: BitKeeper/deleted/.del-datadict_bug_12777.inc -> mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
      mysql-test/suite/funcs_1/datadict/datadict_load.inc:
        Rename: BitKeeper/deleted/.del-datadict_load.inc -> mysql-test/suite/funcs_1/datadict/datadict_load.inc
      mysql-test/suite/funcs_1/datadict/datadict_master.inc:
        Rename: BitKeeper/deleted/.del-datadict_master.inc -> mysql-test/suite/funcs_1/datadict/datadict_master.inc
      BitKeeper/deleted/.del-datadict_show_schema.inc~b6dc1e8ed481fa92:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
      BitKeeper/deleted/.del-datadict_show_table_design.inc~517436f76de0716b:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
      mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc:
        Rename: BitKeeper/deleted/.del-datadict_show_schema.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
      mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc:
        Rename: BitKeeper/deleted/.del-datadict_show_table_design.inc -> mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
      BitKeeper/deleted/.del-datadict_tables.inc~cf3c01f9d1cd0cdf:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
      BitKeeper/deleted/.del-datadict_tables_error.inc~5516c7f2d254fdee:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
      BitKeeper/deleted/.del-datadict_tables_error_1.inc~18e7ad369f9eb3fd:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
      BitKeeper/deleted/.del-datadict_tables_error_1044.inc~3cfe7748d18be96c:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
      BitKeeper/deleted/.del-datadict_tables_error_1049.inc~61e79841bf09fc97:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error_1.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error_1044.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error_1049.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
      BitKeeper/deleted/.del-datadict_tables_error_1051.inc~e637de2d82fa7519:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
      BitKeeper/deleted/.del-datadict_tables_error_1146.inc~3f6d5feff7f0e9d0:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
      BitKeeper/deleted/.del-datadict_tables_error_1288.inc~2f5deb63fbe93e71:
        Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error_1051.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error_1146.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
      BitKeeper/deleted/.del-create_database.inc~ef2ebad71f178a1c:
        Delete: mysql-test/suite/funcs_1/include/create_database.inc
      BitKeeper/deleted/.del-create_user_lowest_priv.inc~6f636433dda5160c:
        Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
      mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc:
        Rename: BitKeeper/deleted/.del-datadict_tables_error_1288.inc -> mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
      mysql-test/suite/funcs_1/include/create_database.inc:
        Rename: BitKeeper/deleted/.del-create_database.inc -> mysql-test/suite/funcs_1/include/create_database.inc
      mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc:
        Rename: BitKeeper/deleted/.del-create_user_lowest_priv.inc -> mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
      BitKeeper/deleted/.del-create_user_no_super.inc~1d0bed25cc65132f:
        Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
      BitKeeper/deleted/.del-innodb_tb1.inc~7e6d03d2ddf3b609:
        Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
      BitKeeper/deleted/.del-innodb_tb2.inc~2ab09e131335c5ac:
        Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
      mysql-test/suite/funcs_1/include/create_user_no_super.inc:
        Rename: BitKeeper/deleted/.del-create_user_no_super.inc -> mysql-test/suite/funcs_1/include/create_user_no_super.inc
      mysql-test/suite/funcs_1/include/innodb_tb1.inc:
        Rename: BitKeeper/deleted/.del-innodb_tb1.inc -> mysql-test/suite/funcs_1/include/innodb_tb1.inc
      BitKeeper/deleted/.del-innodb_tb3.inc~ce29b178da64097:
        Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
      BitKeeper/deleted/.del-innodb_tb4.inc~912d46a6ce99beb:
        Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
      mysql-test/suite/funcs_1/include/innodb_tb2.inc:
        Rename: BitKeeper/deleted/.del-innodb_tb2.inc -> mysql-test/suite/funcs_1/include/innodb_tb2.inc
      mysql-test/suite/funcs_1/include/innodb_tb3.inc:
        Rename: BitKeeper/deleted/.del-innodb_tb3.inc -> mysql-test/suite/funcs_1/include/innodb_tb3.inc
      mysql-test/suite/funcs_1/include/innodb_tb4.inc:
        Rename: BitKeeper/deleted/.del-innodb_tb4.inc -> mysql-test/suite/funcs_1/include/innodb_tb4.inc
      BitKeeper/deleted/.del-memory_tb1.inc~26b9bca8492b8ef0:
        Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
      BitKeeper/deleted/.del-memory_tb2.inc~9789d498ce902299:
        Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
      BitKeeper/deleted/.del-memory_tb3.inc~f68852743e949b69:
        Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
      mysql-test/suite/funcs_1/include/memory_tb1.inc:
        Rename: BitKeeper/deleted/.del-memory_tb1.inc -> mysql-test/suite/funcs_1/include/memory_tb1.inc
      mysql-test/suite/funcs_1/include/memory_tb2.inc:
        Rename: BitKeeper/deleted/.del-memory_tb2.inc -> mysql-test/suite/funcs_1/include/memory_tb2.inc
      BitKeeper/deleted/.del-memory_tb4.inc~19ec0e6953e071e6:
        Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
      BitKeeper/deleted/.del-myisam_tb1.inc~9f4487705fda1b27:
        Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
      mysql-test/suite/funcs_1/include/memory_tb3.inc:
        Rename: BitKeeper/deleted/.del-memory_tb3.inc -> mysql-test/suite/funcs_1/include/memory_tb3.inc
      mysql-test/suite/funcs_1/include/memory_tb4.inc:
        Rename: BitKeeper/deleted/.del-memory_tb4.inc -> mysql-test/suite/funcs_1/include/memory_tb4.inc
      mysql-test/suite/funcs_1/include/myisam_tb1.inc:
        Rename: BitKeeper/deleted/.del-myisam_tb1.inc -> mysql-test/suite/funcs_1/include/myisam_tb1.inc
      BitKeeper/deleted/.del-myisam_tb2.inc~5433401ca94057c3:
        Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
      BitKeeper/deleted/.del-myisam_tb3.inc~8056471332f80a19:
        Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
      BitKeeper/deleted/.del-myisam_tb4.inc~5e51596cea151c88:
        Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
      mysql-test/suite/funcs_1/include/myisam_tb2.inc:
        Rename: BitKeeper/deleted/.del-myisam_tb2.inc -> mysql-test/suite/funcs_1/include/myisam_tb2.inc
      mysql-test/suite/funcs_1/include/myisam_tb3.inc:
        Rename: BitKeeper/deleted/.del-myisam_tb3.inc -> mysql-test/suite/funcs_1/include/myisam_tb3.inc
      BitKeeper/deleted/.del-show_connection.inc~e779f70c38f084c6:
        Delete: mysql-test/suite/funcs_1/include/show_connection.inc
      BitKeeper/deleted/.del-sp_tb.inc~68c5d8cee47a7ebc:
        Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
      mysql-test/suite/funcs_1/include/myisam_tb4.inc:
        Rename: BitKeeper/deleted/.del-myisam_tb4.inc -> mysql-test/suite/funcs_1/include/myisam_tb4.inc
      mysql-test/suite/funcs_1/include/show_connection.inc:
        Rename: BitKeeper/deleted/.del-show_connection.inc -> mysql-test/suite/funcs_1/include/show_connection.inc
      BitKeeper/deleted/.del-DataGen_local.pl~3239b01670d34dde:
        Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
      BitKeeper/deleted/.del-DataGen_modify.pl~b7fa80d2d927dae6:
        Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
      mysql-test/suite/funcs_1/include/sp_tb.inc:
        Rename: BitKeeper/deleted/.del-sp_tb.inc -> mysql-test/suite/funcs_1/include/sp_tb.inc
      mysql-test/suite/funcs_1/lib/DataGen_local.pl:
        Rename: BitKeeper/deleted/.del-DataGen_local.pl -> mysql-test/suite/funcs_1/lib/DataGen_local.pl
      mysql-test/suite/funcs_1/lib/DataGen_modify.pl:
        Rename: BitKeeper/deleted/.del-DataGen_modify.pl -> mysql-test/suite/funcs_1/lib/DataGen_modify.pl
      BitKeeper/deleted/.del-innodb__datadict.result~c02e1f54796a8ca6:
        Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
      BitKeeper/deleted/.del-innodb__load.result~e93101337aed3e72:
        Delete: mysql-test/suite/funcs_1/r/innodb__load.result
      mysql-test/suite/funcs_1/r/innodb__datadict.result:
        Rename: BitKeeper/deleted/.del-innodb__datadict.result -> mysql-test/suite/funcs_1/r/innodb__datadict.result
      mysql-test/suite/funcs_1/r/innodb__load.result:
        Rename: BitKeeper/deleted/.del-innodb__load.result -> mysql-test/suite/funcs_1/r/innodb__load.result
      BitKeeper/deleted/.del-innodb_bitdata.result~799181269a7c3f76:
        Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
      BitKeeper/deleted/.del-innodb_cursors.result~5501346a312eb2c:
        Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
      BitKeeper/deleted/.del-innodb_func_view.result~40832cbc3cd01357:
        Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/innodb_bitdata.result:
        Rename: BitKeeper/deleted/.del-innodb_bitdata.result -> mysql-test/suite/funcs_1/r/innodb_bitdata.result
      mysql-test/suite/funcs_1/r/innodb_cursors.result:
        Rename: BitKeeper/deleted/.del-innodb_cursors.result -> mysql-test/suite/funcs_1/r/innodb_cursors.result
      BitKeeper/deleted/.del-innodb_storedproc.result~f519851b98532739:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
      BitKeeper/deleted/.del-innodb_storedproc_02.result~4183d0a85e3d9c3f:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
      mysql-test/suite/funcs_1/r/innodb_func_view.result:
        Rename: BitKeeper/deleted/.del-innodb_func_view.result -> mysql-test/suite/funcs_1/r/innodb_func_view.result
      mysql-test/suite/funcs_1/r/innodb_storedproc.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc.result -> mysql-test/suite/funcs_1/r/innodb_storedproc.result
      BitKeeper/deleted/.del-innodb_storedproc_03.result~a27277dc4cfcd8b4:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
      BitKeeper/deleted/.del-innodb_storedproc_06.result~ebc1ed638105c6a4:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_02.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_03.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_06.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      BitKeeper/deleted/.del-innodb_storedproc_07.result~aef68b204aae26a5:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
      BitKeeper/deleted/.del-innodb_storedproc_08.result~110d457978e5bb08:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_07.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
      BitKeeper/deleted/.del-innodb_storedproc_10.result~bac006c3f8720ff7:
        Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
      BitKeeper/deleted/.del-innodb_trig_0102.result~552e7936f9c3e8b1:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_08.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_10.result -> mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_0102.result -> mysql-test/suite/funcs_1/r/innodb_trig_0102.result
      BitKeeper/deleted/.del-innodb_trig_03.result~e0001f2ae0594271:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
      BitKeeper/deleted/.del-innodb_trig_0407.result~30a523819cb1dbce:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
      BitKeeper/deleted/.del-innodb_trig_08.result~7fb6bf5750a72547:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
      mysql-test/suite/funcs_1/r/innodb_trig_03.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_03.result -> mysql-test/suite/funcs_1/r/innodb_trig_03.result
      mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_0407.result -> mysql-test/suite/funcs_1/r/innodb_trig_0407.result
      BitKeeper/deleted/.del-innodb_trig_09.result~45bdbd4e78d18c43:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
      BitKeeper/deleted/.del-innodb_trig_1011ext.result~693d4af717160b0:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
      mysql-test/suite/funcs_1/r/innodb_trig_08.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_08.result -> mysql-test/suite/funcs_1/r/innodb_trig_08.result
      mysql-test/suite/funcs_1/r/innodb_trig_09.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_09.result -> mysql-test/suite/funcs_1/r/innodb_trig_09.result
      mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.result -> mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
      BitKeeper/deleted/.del-innodb_trig_frkey.result~f8324099abe39a:
        Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
      BitKeeper/deleted/.del-innodb_triggers.result~47d4751cc196bab9:
        Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
      mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
        Rename: BitKeeper/deleted/.del-innodb_trig_frkey.result -> mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
      mysql-test/suite/funcs_1/r/innodb_triggers.result:
        Rename: BitKeeper/deleted/.del-innodb_triggers.result -> mysql-test/suite/funcs_1/r/innodb_triggers.result
      BitKeeper/deleted/.del-innodb_views.result~f6ee0e22cb353b49:
        Delete: mysql-test/suite/funcs_1/r/innodb_views.result
      BitKeeper/deleted/.del-memory__datadict.result~49b74301886e1847:
        Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
      BitKeeper/deleted/.del-memory__load.result~e759ae177d135580:
        Delete: mysql-test/suite/funcs_1/r/memory__load.result
      mysql-test/suite/funcs_1/r/innodb_views.result:
        Rename: BitKeeper/deleted/.del-innodb_views.result -> mysql-test/suite/funcs_1/r/innodb_views.result
      mysql-test/suite/funcs_1/r/memory__datadict.result:
        Rename: BitKeeper/deleted/.del-memory__datadict.result -> mysql-test/suite/funcs_1/r/memory__datadict.result
      BitKeeper/deleted/.del-memory_bitdata.result~cbda7481debfd3d2:
        Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
      BitKeeper/deleted/.del-memory_cursors.result~ff9866fb5dfd7e3a:
        Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
      mysql-test/suite/funcs_1/r/memory__load.result:
        Rename: BitKeeper/deleted/.del-memory__load.result -> mysql-test/suite/funcs_1/r/memory__load.result
      mysql-test/suite/funcs_1/r/memory_bitdata.result:
        Rename: BitKeeper/deleted/.del-memory_bitdata.result -> mysql-test/suite/funcs_1/r/memory_bitdata.result
      mysql-test/suite/funcs_1/r/memory_cursors.result:
        Rename: BitKeeper/deleted/.del-memory_cursors.result -> mysql-test/suite/funcs_1/r/memory_cursors.result
      BitKeeper/deleted/.del-memory_func_view.result~e552d7de38647c08:
        Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
      BitKeeper/deleted/.del-memory_storedproc.result~f448dceb2b3c0663:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
      mysql-test/suite/funcs_1/r/memory_func_view.result:
        Rename: BitKeeper/deleted/.del-memory_func_view.result -> mysql-test/suite/funcs_1/r/memory_func_view.result
      mysql-test/suite/funcs_1/r/memory_storedproc.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc.result -> mysql-test/suite/funcs_1/r/memory_storedproc.result
      BitKeeper/deleted/.del-memory_storedproc_02.result~8fe9a1951ddcddb2:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
      BitKeeper/deleted/.del-memory_storedproc_03.result~da1a54e7f7fb565c:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
      mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc_02.result -> mysql-test/suite/funcs_1/r/memory_storedproc_02.result
      mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc_03.result -> mysql-test/suite/funcs_1/r/memory_storedproc_03.result
      BitKeeper/deleted/.del-memory_storedproc_06.result~a2f933a1c033c7a4:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      BitKeeper/deleted/.del-memory_storedproc_07.result~2bc5723a4df61278:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
      BitKeeper/deleted/.del-memory_storedproc_08.result~5e68fabd8a121268:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc_06.result -> mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc_07.result -> mysql-test/suite/funcs_1/r/memory_storedproc_07.result
      BitKeeper/deleted/.del-memory_storedproc_10.result~2eae10df620fed3b:
        Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc_08.result -> mysql-test/suite/funcs_1/r/memory_storedproc_08.result
      mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
        Rename: BitKeeper/deleted/.del-memory_storedproc_10.result -> mysql-test/suite/funcs_1/r/memory_storedproc_10.result
      BitKeeper/deleted/.del-memory_trig_0102.result~6ddf339f2d5523c6:
        Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
      BitKeeper/deleted/.del-memory_trig_03.result~843e1e88cec532e7:
        Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
      BitKeeper/deleted/.del-memory_trig_0407.result~a561a80e40cd820a:
        Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
      mysql-test/suite/funcs_1/r/memory_trig_0102.result:
        Rename: BitKeeper/deleted/.del-memory_trig_0102.result -> mysql-test/suite/funcs_1/r/memory_trig_0102.result
      mysql-test/suite/funcs_1/r/memory_trig_03.result:
        Rename: BitKeeper/deleted/.del-memory_trig_03.result -> mysql-test/suite/funcs_1/r/memory_trig_03.result
      BitKeeper/deleted/.del-memory_trig_08.result~3a5fc5dba5ab1378:
        Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
      BitKeeper/deleted/.del-memory_trig_09.result~f54649a13258f1f9:
        Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
      mysql-test/suite/funcs_1/r/memory_trig_0407.result:
        Rename: BitKeeper/deleted/.del-memory_trig_0407.result -> mysql-test/suite/funcs_1/r/memory_trig_0407.result
      mysql-test/suite/funcs_1/r/memory_trig_08.result:
        Rename: BitKeeper/deleted/.del-memory_trig_08.result -> mysql-test/suite/funcs_1/r/memory_trig_08.result
      mysql-test/suite/funcs_1/r/memory_trig_09.result:
        Rename: BitKeeper/deleted/.del-memory_trig_09.result -> mysql-test/suite/funcs_1/r/memory_trig_09.result
      BitKeeper/deleted/.del-memory_trig_1011ext.result~58022c2cc6d43a43:
        Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
      BitKeeper/deleted/.del-memory_triggers.result~4720213a17bd1f8b:
        Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
      mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
        Rename: BitKeeper/deleted/.del-memory_trig_1011ext.result -> mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
      mysql-test/suite/funcs_1/r/memory_triggers.result:
        Rename: BitKeeper/deleted/.del-memory_triggers.result -> mysql-test/suite/funcs_1/r/memory_triggers.result
      BitKeeper/deleted/.del-memory_views.result~d600cc46b350d191:
        Delete: mysql-test/suite/funcs_1/r/memory_views.result
      BitKeeper/deleted/.del-myisam__datadict.result~84fd7948204f0fcf:
        Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
      mysql-test/suite/funcs_1/r/memory_views.result:
        Rename: BitKeeper/deleted/.del-memory_views.result -> mysql-test/suite/funcs_1/r/memory_views.result
      mysql-test/suite/funcs_1/r/myisam__datadict.result:
        Rename: BitKeeper/deleted/.del-myisam__datadict.result -> mysql-test/suite/funcs_1/r/myisam__datadict.result
      BitKeeper/deleted/.del-myisam__load.result~a5cdfae657f4420a:
        Delete: mysql-test/suite/funcs_1/r/myisam__load.result
      BitKeeper/deleted/.del-myisam_bitdata.result~58a8f4201386a085:
        Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
      mysql-test/suite/funcs_1/r/myisam__load.result:
        Rename: BitKeeper/deleted/.del-myisam__load.result -> mysql-test/suite/funcs_1/r/myisam__load.result
      mysql-test/suite/funcs_1/r/myisam_bitdata.result:
        Rename: BitKeeper/deleted/.del-myisam_bitdata.result -> mysql-test/suite/funcs_1/r/myisam_bitdata.result
      BitKeeper/deleted/.del-myisam_cursors.result~49d90d672526a743:
        Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
      BitKeeper/deleted/.del-myisam_func_view.result~534db497d89b6db8:
        Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
      mysql-test/suite/funcs_1/r/myisam_cursors.result:
        Rename: BitKeeper/deleted/.del-myisam_cursors.result -> mysql-test/suite/funcs_1/r/myisam_cursors.result
      mysql-test/suite/funcs_1/r/myisam_func_view.result:
        Rename: BitKeeper/deleted/.del-myisam_func_view.result -> mysql-test/suite/funcs_1/r/myisam_func_view.result
      BitKeeper/deleted/.del-myisam_storedproc.result~11afaec1d6691272:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
      BitKeeper/deleted/.del-myisam_storedproc_02.result~da54080b38b800e1:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
      BitKeeper/deleted/.del-myisam_storedproc_03.result~f43705b213fa0be7:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
      mysql-test/suite/funcs_1/r/myisam_storedproc.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc.result -> mysql-test/suite/funcs_1/r/myisam_storedproc.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_02.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
      BitKeeper/deleted/.del-myisam_storedproc_06.result~82bc7661134f9251:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      BitKeeper/deleted/.del-myisam_storedproc_07.result~43793b065606447:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_03.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_06.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_07.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
      BitKeeper/deleted/.del-myisam_storedproc_08.result~a41f1829cf91919d:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
      BitKeeper/deleted/.del-myisam_storedproc_10.result~601f1f3b7ff82de6:
        Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_08.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_10.result -> mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
      BitKeeper/deleted/.del-myisam_trig_0102.result~aa3d68a52b9d9461:
        Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
      BitKeeper/deleted/.del-myisam_trig_03.result~a958349fc6dbafc4:
        Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
        Rename: BitKeeper/deleted/.del-myisam_trig_0102.result -> mysql-test/suite/funcs_1/r/myisam_trig_0102.result
      mysql-test/suite/funcs_1/r/myisam_trig_03.result:
        Rename: BitKeeper/deleted/.del-myisam_trig_03.result -> mysql-test/suite/funcs_1/r/myisam_trig_03.result
      BitKeeper/deleted/.del-myisam_trig_0407.result~ff5d0269d6f069ac:
        Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
      BitKeeper/deleted/.del-myisam_trig_08.result~b116c6baef5c9329:
        Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
      BitKeeper/deleted/.del-myisam_trig_09.result~f5e5181e4de57aa2:
        Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
      mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
        Rename: BitKeeper/deleted/.del-myisam_trig_0407.result -> mysql-test/suite/funcs_1/r/myisam_trig_0407.result
      mysql-test/suite/funcs_1/r/myisam_trig_08.result:
        Rename: BitKeeper/deleted/.del-myisam_trig_08.result -> mysql-test/suite/funcs_1/r/myisam_trig_08.result
      BitKeeper/deleted/.del-myisam_trig_1011ext.result~188c33cf34d15c28:
        Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
      BitKeeper/deleted/.del-myisam_triggers.result~5d09cc9a6e725ae0:
        Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
      mysql-test/suite/funcs_1/r/myisam_trig_09.result:
        Rename: BitKeeper/deleted/.del-myisam_trig_09.result -> mysql-test/suite/funcs_1/r/myisam_trig_09.result
      mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
        Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.result -> mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
      BitKeeper/deleted/.del-cleanup_sp_tb.inc~e56fdf367dc4920f:
        Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
      BitKeeper/deleted/.del-myisam_views.result~3f58b2463d68e870:
        Delete: mysql-test/suite/funcs_1/r/myisam_views.result
      mysql-test/suite/funcs_1/r/myisam_triggers.result:
        Rename: BitKeeper/deleted/.del-myisam_triggers.result -> mysql-test/suite/funcs_1/r/myisam_triggers.result
      mysql-test/suite/funcs_1/r/myisam_views.result:
        Rename: BitKeeper/deleted/.del-myisam_views.result -> mysql-test/suite/funcs_1/r/myisam_views.result
      mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
        Rename: BitKeeper/deleted/.del-cleanup_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
      BitKeeper/deleted/.del-load_sp_tb.inc~874151dac20d4609:
        Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
      BitKeeper/deleted/.del-storedproc_02.inc~382fa05b78862c2d:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
      mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
        Rename: BitKeeper/deleted/.del-load_sp_tb.inc -> mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
        Rename: BitKeeper/deleted/.del-storedproc_02.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
      BitKeeper/deleted/.del-storedproc_03.inc~950bd5f0df49c0c0:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
      BitKeeper/deleted/.del-storedproc_06.inc~3313ca46f891a104:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
        Rename: BitKeeper/deleted/.del-storedproc_03.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
        Rename: BitKeeper/deleted/.del-storedproc_06.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      BitKeeper/deleted/.del-storedproc_07.inc~8af2431ad7ef6a1:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
      BitKeeper/deleted/.del-storedproc_08.inc~e2730281eff07089:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
      BitKeeper/deleted/.del-storedproc_08_show.inc~756c67bd3b7d61f8:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_07.inc:
        Rename: BitKeeper/deleted/.del-storedproc_07.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_08.inc:
        Rename: BitKeeper/deleted/.del-storedproc_08.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
      BitKeeper/deleted/.del-storedproc_10.inc~9b2eecdca3bc87e0:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
      BitKeeper/deleted/.del-storedproc_master.inc~d06ed09343243344:
        Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc:
        Rename: BitKeeper/deleted/.del-storedproc_08_show.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
      mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
        Rename: BitKeeper/deleted/.del-storedproc_10.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
      BitKeeper/deleted/.del-disabled.def~5839f38d337055cd:
        Delete: mysql-test/suite/funcs_1/t/disabled.def
      BitKeeper/deleted/.del-innodb__datadict.test~56554dd847c45d1b:
        Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
      mysql-test/suite/funcs_1/storedproc/storedproc_master.inc:
        Rename: BitKeeper/deleted/.del-storedproc_master.inc -> mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
      mysql-test/suite/funcs_1/t/disabled.def:
        Rename: BitKeeper/deleted/.del-disabled.def~1 -> mysql-test/suite/funcs_1/t/disabled.def
      mysql-test/suite/funcs_1/t/innodb__datadict.test:
        Rename: BitKeeper/deleted/.del-innodb__datadict.test -> mysql-test/suite/funcs_1/t/innodb__datadict.test
      BitKeeper/deleted/.del-innodb__load.test~7085d9e6cde80a45:
        Delete: mysql-test/suite/funcs_1/t/innodb__load.test
      BitKeeper/deleted/.del-innodb_bitdata.test~85aa8297cea412f0:
        Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
      BitKeeper/deleted/.del-innodb_cursors.test~b2f689e5aad9ed61:
        Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
      mysql-test/suite/funcs_1/t/innodb__load.test:
        Rename: BitKeeper/deleted/.del-innodb__load.test -> mysql-test/suite/funcs_1/t/innodb__load.test
      mysql-test/suite/funcs_1/t/innodb_bitdata.test:
        Rename: BitKeeper/deleted/.del-innodb_bitdata.test -> mysql-test/suite/funcs_1/t/innodb_bitdata.test
      BitKeeper/deleted/.del-innodb_func_view.test~cefb7d1dd6010a54:
        Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
      mysql-test/suite/funcs_1/t/innodb_cursors.test:
        Rename: BitKeeper/deleted/.del-innodb_cursors.test -> mysql-test/suite/funcs_1/t/innodb_cursors.test
      mysql-test/suite/funcs_1/t/innodb_func_view.test:
        Rename: BitKeeper/deleted/.del-innodb_func_view.test -> mysql-test/suite/funcs_1/t/innodb_func_view.test
      BitKeeper/deleted/.del-innodb_storedproc.test~59836b12f28c524a:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
      BitKeeper/deleted/.del-innodb_storedproc_02.test~b8a1d59320d17ccd:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
      BitKeeper/deleted/.del-innodb_storedproc_03.test~f0a04b626962c3ae:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
      mysql-test/suite/funcs_1/t/innodb_storedproc.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc.test -> mysql-test/suite/funcs_1/t/innodb_storedproc.test
      mysql-test/suite/funcs_1/t/innodb_storedproc_02.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_02.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
      BitKeeper/deleted/.del-innodb_storedproc_06.test~f0c4a7598abaa44:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
      BitKeeper/deleted/.del-innodb_storedproc_07.test~f5fc9e0a296cff76:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
      mysql-test/suite/funcs_1/t/innodb_storedproc_03.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_03.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
      mysql-test/suite/funcs_1/t/innodb_storedproc_06.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_06.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
      mysql-test/suite/funcs_1/t/innodb_storedproc_07.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_07.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
      BitKeeper/deleted/.del-innodb_storedproc_08.test~96c9f3ecc7801edb:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
      BitKeeper/deleted/.del-innodb_storedproc_10.test~368950a6728faf08:
        Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
      BitKeeper/deleted/.del-innodb_trig_0102.test~4c86148638150f86:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
      mysql-test/suite/funcs_1/t/innodb_storedproc_08.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_08.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
      mysql-test/suite/funcs_1/t/innodb_storedproc_10.test:
        Rename: BitKeeper/deleted/.del-innodb_storedproc_10.test -> mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
      BitKeeper/deleted/.del-innodb_trig_03.test~b90f32a29fd224d6:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
      BitKeeper/deleted/.del-innodb_trig_0407.test~8b8d01c8c8b107:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
      mysql-test/suite/funcs_1/t/innodb_trig_0102.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_0102.test -> mysql-test/suite/funcs_1/t/innodb_trig_0102.test
      mysql-test/suite/funcs_1/t/innodb_trig_03.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_03.test -> mysql-test/suite/funcs_1/t/innodb_trig_03.test
      mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_0407.test -> mysql-test/suite/funcs_1/t/innodb_trig_0407.test
      BitKeeper/deleted/.del-innodb_trig_08.test~82ea213f59cf5634:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
      BitKeeper/deleted/.del-innodb_trig_09.test~1407c2016d589067:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
      mysql-test/suite/funcs_1/t/innodb_trig_08.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_08.test -> mysql-test/suite/funcs_1/t/innodb_trig_08.test
      mysql-test/suite/funcs_1/t/innodb_trig_09.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_09.test -> mysql-test/suite/funcs_1/t/innodb_trig_09.test
      BitKeeper/deleted/.del-innodb_trig_1011ext.test~8f405ef2239bcfed:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
      BitKeeper/deleted/.del-innodb_trig_frkey.test~7c1c0af7c80de602:
        Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
      BitKeeper/deleted/.del-innodb_views.test~460914b9e63a58f0:
        Delete: mysql-test/suite/funcs_1/t/innodb_views.test
      mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_1011ext.test -> mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
      mysql-test/suite/funcs_1/t/innodb_trig_frkey.test:
        Rename: BitKeeper/deleted/.del-innodb_trig_frkey.test -> mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
      BitKeeper/deleted/.del-memory__datadict.test~97e67292a3c6ebd0:
        Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
      BitKeeper/deleted/.del-memory__load.test~a18998091ef9b001:
        Delete: mysql-test/suite/funcs_1/t/memory__load.test
      mysql-test/suite/funcs_1/t/innodb_views.test:
        Rename: BitKeeper/deleted/.del-innodb_views.test -> mysql-test/suite/funcs_1/t/innodb_views.test
      mysql-test/suite/funcs_1/t/memory__datadict.test:
        Rename: BitKeeper/deleted/.del-memory__datadict.test -> mysql-test/suite/funcs_1/t/memory__datadict.test
      mysql-test/suite/funcs_1/t/memory__load.test:
        Rename: BitKeeper/deleted/.del-memory__load.test -> mysql-test/suite/funcs_1/t/memory__load.test
      BitKeeper/deleted/.del-memory_bitdata.test~8c3293caa99e7db2:
        Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
      BitKeeper/deleted/.del-memory_cursors.test~208b9d3a3b388e5a:
        Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
      BitKeeper/deleted/.del-memory_func_view.test~43ca20a516b29af3:
        Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
      mysql-test/suite/funcs_1/t/memory_bitdata.test:
        Rename: BitKeeper/deleted/.del-memory_bitdata.test -> mysql-test/suite/funcs_1/t/memory_bitdata.test
      mysql-test/suite/funcs_1/t/memory_cursors.test:
        Rename: BitKeeper/deleted/.del-memory_cursors.test -> mysql-test/suite/funcs_1/t/memory_cursors.test
      BitKeeper/deleted/.del-memory_storedproc.test~1b6d3856750b4103:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
      BitKeeper/deleted/.del-memory_storedproc_02.test~3d699d9d8cadcec:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
      mysql-test/suite/funcs_1/t/memory_func_view.test:
        Rename: BitKeeper/deleted/.del-memory_func_view.test -> mysql-test/suite/funcs_1/t/memory_func_view.test
      mysql-test/suite/funcs_1/t/memory_storedproc.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc.test -> mysql-test/suite/funcs_1/t/memory_storedproc.test
      mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc_02.test -> mysql-test/suite/funcs_1/t/memory_storedproc_02.test
      BitKeeper/deleted/.del-memory_storedproc_03.test~b8e4f73c53d2d65c:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
      BitKeeper/deleted/.del-memory_storedproc_06.test~6f0344325cdc7e47:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
      BitKeeper/deleted/.del-memory_storedproc_07.test~d72c0c08d46ff3d:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
      mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc_03.test -> mysql-test/suite/funcs_1/t/memory_storedproc_03.test
      mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc_06.test -> mysql-test/suite/funcs_1/t/memory_storedproc_06.test
      BitKeeper/deleted/.del-memory_storedproc_08.test~abb018786b9c9cc4:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
      BitKeeper/deleted/.del-memory_storedproc_10.test~235432215fa35be8:
        Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
      mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc_07.test -> mysql-test/suite/funcs_1/t/memory_storedproc_07.test
      mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc_08.test -> mysql-test/suite/funcs_1/t/memory_storedproc_08.test
      mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
        Rename: BitKeeper/deleted/.del-memory_storedproc_10.test -> mysql-test/suite/funcs_1/t/memory_storedproc_10.test
      BitKeeper/deleted/.del-memory_trig_0102.test~14bcf15df5764973:
        Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
      BitKeeper/deleted/.del-memory_trig_03.test~27016478f8698755:
        Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
      mysql-test/suite/funcs_1/t/memory_trig_0102.test:
        Rename: BitKeeper/deleted/.del-memory_trig_0102.test -> mysql-test/suite/funcs_1/t/memory_trig_0102.test
      mysql-test/suite/funcs_1/t/memory_trig_03.test:
        Rename: BitKeeper/deleted/.del-memory_trig_03.test -> mysql-test/suite/funcs_1/t/memory_trig_03.test
      BitKeeper/deleted/.del-memory_trig_0407.test~519fa098e2e89a49:
        Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
      BitKeeper/deleted/.del-memory_trig_08.test~eb12b11ef9e956ca:
        Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
      BitKeeper/deleted/.del-memory_trig_09.test~f53b89eced332954:
        Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
      mysql-test/suite/funcs_1/t/memory_trig_0407.test:
        Rename: BitKeeper/deleted/.del-memory_trig_0407.test -> mysql-test/suite/funcs_1/t/memory_trig_0407.test
      mysql-test/suite/funcs_1/t/memory_trig_08.test:
        Rename: BitKeeper/deleted/.del-memory_trig_08.test -> mysql-test/suite/funcs_1/t/memory_trig_08.test
      BitKeeper/deleted/.del-memory_trig_1011ext.test~b090a0fc7f12ab08:
        Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
      BitKeeper/deleted/.del-memory_views.test~91ffafb774f67137:
        Delete: mysql-test/suite/funcs_1/t/memory_views.test
      mysql-test/suite/funcs_1/t/memory_trig_09.test:
        Rename: BitKeeper/deleted/.del-memory_trig_09.test -> mysql-test/suite/funcs_1/t/memory_trig_09.test
      mysql-test/suite/funcs_1/t/memory_trig_1011ext.test:
        Rename: BitKeeper/deleted/.del-memory_trig_1011ext.test -> mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
      mysql-test/suite/funcs_1/t/memory_views.test:
        Rename: BitKeeper/deleted/.del-memory_views.test -> mysql-test/suite/funcs_1/t/memory_views.test
      BitKeeper/deleted/.del-myisam__datadict.test~cae9a60de78fc35d:
        Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
      BitKeeper/deleted/.del-myisam__load.test~475638485078225c:
        Delete: mysql-test/suite/funcs_1/t/myisam__load.test
      BitKeeper/deleted/.del-myisam_bitdata.test~12a510e9660ace8b:
        Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
      mysql-test/suite/funcs_1/t/myisam__datadict.test:
        Rename: BitKeeper/deleted/.del-myisam__datadict.test -> mysql-test/suite/funcs_1/t/myisam__datadict.test
      mysql-test/suite/funcs_1/t/myisam__load.test:
        Rename: BitKeeper/deleted/.del-myisam__load.test -> mysql-test/suite/funcs_1/t/myisam__load.test
      BitKeeper/deleted/.del-myisam_cursors.test~e14ab9d55d14f27b:
        Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
      BitKeeper/deleted/.del-myisam_func_view.test~1e272349f93f83f2:
        Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
      mysql-test/suite/funcs_1/t/myisam_bitdata.test:
        Rename: BitKeeper/deleted/.del-myisam_bitdata.test -> mysql-test/suite/funcs_1/t/myisam_bitdata.test
      mysql-test/suite/funcs_1/t/myisam_cursors.test:
        Rename: BitKeeper/deleted/.del-myisam_cursors.test -> mysql-test/suite/funcs_1/t/myisam_cursors.test
      mysql-test/suite/funcs_1/t/myisam_func_view.test:
        Rename: BitKeeper/deleted/.del-myisam_func_view.test -> mysql-test/suite/funcs_1/t/myisam_func_view.test
      BitKeeper/deleted/.del-myisam_storedproc.test~2ba6363d2e1a3c34:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
      BitKeeper/deleted/.del-myisam_storedproc_02.test~3baa154a9e7da1f9:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
      mysql-test/suite/funcs_1/t/myisam_storedproc.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc.test -> mysql-test/suite/funcs_1/t/myisam_storedproc.test
      mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_02.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
      BitKeeper/deleted/.del-myisam_storedproc_03.test~b6ca96ed3dfbe37f:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
      BitKeeper/deleted/.del-myisam_storedproc_06.test~a4150b544475b75:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
      BitKeeper/deleted/.del-myisam_storedproc_07.test~618a6a50ec4ad67e:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
      mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_03.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
      mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_06.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
      BitKeeper/deleted/.del-myisam_storedproc_08.test~84a1b27da7087d9:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
      BitKeeper/deleted/.del-myisam_storedproc_10.test~488ef8f94b0e21bd:
        Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
      mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_07.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
      mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_08.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
      mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
        Rename: BitKeeper/deleted/.del-myisam_storedproc_10.test -> mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
      BitKeeper/deleted/.del-myisam_trig_0102.test~ba6337bfcf06720f:
        Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
      BitKeeper/deleted/.del-myisam_trig_03.test~26c97fd2347ce5a5:
        Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
      BitKeeper/deleted/.del-myisam_trig_0407.test~bf799febfd188363:
        Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
      mysql-test/suite/funcs_1/t/myisam_trig_0102.test:
        Rename: BitKeeper/deleted/.del-myisam_trig_0102.test -> mysql-test/suite/funcs_1/t/myisam_trig_0102.test
      mysql-test/suite/funcs_1/t/myisam_trig_03.test:
        Rename: BitKeeper/deleted/.del-myisam_trig_03.test -> mysql-test/suite/funcs_1/t/myisam_trig_03.test
      BitKeeper/deleted/.del-myisam_trig_08.test~9dd03c9fb189a2d0:
        Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
      BitKeeper/deleted/.del-myisam_trig_09.test~4706099520d9fcff:
        Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
      mysql-test/suite/funcs_1/t/myisam_trig_0407.test:
        Rename: BitKeeper/deleted/.del-myisam_trig_0407.test -> mysql-test/suite/funcs_1/t/myisam_trig_0407.test
      mysql-test/suite/funcs_1/t/myisam_trig_08.test:
        Rename: BitKeeper/deleted/.del-myisam_trig_08.test -> mysql-test/suite/funcs_1/t/myisam_trig_08.test
      BitKeeper/deleted/.del-myisam_trig_1011ext.test~33947cfdce83359f:
        Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
      BitKeeper/deleted/.del-myisam_views.test~8191b1664f3fb073:
        Delete: mysql-test/suite/funcs_1/t/myisam_views.test
      mysql-test/suite/funcs_1/t/myisam_trig_09.test:
        Rename: BitKeeper/deleted/.del-myisam_trig_09.test -> mysql-test/suite/funcs_1/t/myisam_trig_09.test
      mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test:
        Rename: BitKeeper/deleted/.del-myisam_trig_1011ext.test -> mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
      mysql-test/suite/funcs_1/t/myisam_views.test:
        Rename: BitKeeper/deleted/.del-myisam_views.test -> mysql-test/suite/funcs_1/t/myisam_views.test
      BitKeeper/deleted/.del-trig_frkey.inc~ddc32f51b7efc8a7:
        Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
      BitKeeper/deleted/.del-trig_frkey2.inc~6e45874f67bff63f:
        Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
      BitKeeper/deleted/.del-triggers_0102.inc~3e3628c21eb1b6b3:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
      mysql-test/suite/funcs_1/triggers/trig_frkey.inc:
        Rename: BitKeeper/deleted/.del-trig_frkey.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey.inc
      mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
        Rename: BitKeeper/deleted/.del-trig_frkey2.inc -> mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
      BitKeeper/deleted/.del-triggers_03.inc~952da03e2aa2e366:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
      BitKeeper/deleted/.del-triggers_0407.inc~26d5f499dcbba3dd:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
      mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
        Rename: BitKeeper/deleted/.del-triggers_0102.inc -> mysql-test/suite/funcs_1/triggers/triggers_0102.inc
      mysql-test/suite/funcs_1/triggers/triggers_03.inc:
        Rename: BitKeeper/deleted/.del-triggers_03.inc -> mysql-test/suite/funcs_1/triggers/triggers_03.inc
      mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
        Rename: BitKeeper/deleted/.del-triggers_0407.inc -> mysql-test/suite/funcs_1/triggers/triggers_0407.inc
      BitKeeper/deleted/.del-triggers_08.inc~23ce6806b152b7fc:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
      BitKeeper/deleted/.del-triggers_09.inc~77f09e3677536d9f:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
      mysql-test/suite/funcs_1/triggers/triggers_08.inc:
        Rename: BitKeeper/deleted/.del-triggers_08.inc -> mysql-test/suite/funcs_1/triggers/triggers_08.inc
      mysql-test/suite/funcs_1/triggers/triggers_09.inc:
        Rename: BitKeeper/deleted/.del-triggers_09.inc -> mysql-test/suite/funcs_1/triggers/triggers_09.inc
      BitKeeper/deleted/.del-func_view.inc~f237e7bc7e6cfcbc:
        Delete: mysql-test/suite/funcs_1/views/func_view.inc
      BitKeeper/deleted/.del-triggers_1011ext.inc~ed096947fb03693:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
      BitKeeper/deleted/.del-triggers_master.test~fc19575e956a0b72:
        Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
      mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
        Rename: BitKeeper/deleted/.del-triggers_1011ext.inc -> mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
      mysql-test/suite/funcs_1/triggers/triggers_master.test:
        Rename: BitKeeper/deleted/.del-triggers_master.test -> mysql-test/suite/funcs_1/triggers/triggers_master.test
      BitKeeper/deleted/.del-fv1.inc~87b440f98d8b8193:
        Delete: mysql-test/suite/funcs_1/views/fv1.inc
      BitKeeper/deleted/.del-fv2.inc~26896746173f9122:
        Delete: mysql-test/suite/funcs_1/views/fv2.inc
      mysql-test/suite/funcs_1/views/func_view.inc:
        Rename: BitKeeper/deleted/.del-func_view.inc -> mysql-test/suite/funcs_1/views/func_view.inc
      mysql-test/suite/funcs_1/views/fv1.inc:
        Rename: BitKeeper/deleted/.del-fv1.inc -> mysql-test/suite/funcs_1/views/fv1.inc
      mysql-test/suite/funcs_1/views/fv2.inc:
        Rename: BitKeeper/deleted/.del-fv2.inc -> mysql-test/suite/funcs_1/views/fv2.inc
      BitKeeper/deleted/.del-fv_cast.inc~ef53731c7c6dcd27:
        Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
      BitKeeper/deleted/.del-fv_if1.inc~86c887a184ab39eb:
        Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
      mysql-test/suite/funcs_1/views/fv_cast.inc:
        Rename: BitKeeper/deleted/.del-fv_cast.inc -> mysql-test/suite/funcs_1/views/fv_cast.inc
      mysql-test/suite/funcs_1/views/fv_if1.inc:
        Rename: BitKeeper/deleted/.del-fv_if1.inc -> mysql-test/suite/funcs_1/views/fv_if1.inc
      BitKeeper/deleted/.del-fv_if2.inc~483e3f7a24f7e55c:
        Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
      BitKeeper/deleted/.del-fv_ifnull.inc~fbffea1ccd756112:
        Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
      BitKeeper/deleted/.del-views_master.inc~2d2a52a68d0d77fd:
        Delete: mysql-test/suite/funcs_1/views/views_master.inc
      mysql-test/suite/funcs_1/views/fv_if2.inc:
        Rename: BitKeeper/deleted/.del-fv_if2.inc -> mysql-test/suite/funcs_1/views/fv_if2.inc
      mysql-test/suite/funcs_1/views/fv_ifnull.inc:
        Rename: BitKeeper/deleted/.del-fv_ifnull.inc -> mysql-test/suite/funcs_1/views/fv_ifnull.inc
      BitKeeper/deleted/.del-README.txt:
        Delete: mysql-test/suite/funcs_1/README.txt
      mysql-test/suite/funcs_1/README.txt:
        Rename: BitKeeper/deleted/.del-README.txt-renamed -> mysql-test/suite/funcs_1/README.txt
      mysql-test/suite/funcs_1/views/views_master.inc:
        Rename: BitKeeper/deleted/.del-views_master.inc -> mysql-test/suite/funcs_1/views/views_master.inc
      a3544df5
  2. 21 Jul, 2007 1 commit
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 9e9f196b
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      libmysql/libmysql.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      9e9f196b
  3. 20 Jul, 2007 10 commits
  4. 19 Jul, 2007 27 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1 · 496ddec1
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        SCCS merged
      tests/mysql_client_test.c:
        SCCS merged
      496ddec1
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · 900f8d8a
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/set_var.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      900f8d8a
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 5c4c5941
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      5c4c5941
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44 · 25491503
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
      
      
      configure.in:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      25491503
    • unknown's avatar
      BUG#20815 Errno 12 on Windows after 197 connections · 2163d202
      unknown authored
      
      CMakeLists.txt:
        BUG#20815 Set stack size. This value is really supposed to be the linker's default. I'm not quite sure why we have to specify it manually too.
      2163d202
    • unknown's avatar
      Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag. · 7122b729
      unknown authored
      The Item_date_typecast::val_int function doesn't reset null_value flag.
      This makes all values that follows the first null value to be treated as nulls
      and led to a wrong result.
      
      Now the Item_date_typecast::val_int function correctly sets the null_value flag
      for both null and non-null values.
      
      
      mysql-test/t/cast.test:
        Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
        the null_value flag.
      mysql-test/r/cast.result:
        Added a test case for the bug#29898:  Item_date_typecast::val_int doesn't reset
        the null_value flag.
      sql/item_timefunc.cc:
        Bug#29898: Item_date_typecast::val_int doesn't reset the null_value flag.
        Now the Item_date_typecast::val_int function correctly sets the null_value flag
        for both null and non-null values.
      7122b729
    • unknown's avatar
      mysql_client_test fixed · f8c9269f
      unknown authored
      
      tests/mysql_client_test.c:
        rc assignement added
      f8c9269f
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · dab67085
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      dab67085
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 927063c7
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      sql/mysql_priv.h:
        Auto merged
      927063c7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 4358b4b9
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      4358b4b9
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 6a34c8fc
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/29850-bug-5.0-opt-mysql
      
      6a34c8fc
    • unknown's avatar
      Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs · 134138bb
      unknown authored
      a temporary table.
      
      The result string of the Item_func_group_concat wasn't initialized in the 
      copying constructor of the Item_func_group_concat class. This led to a
      wrong charset of GROUP_CONCAT result when the select employs a temporary
      table.
      
      The copying constructor of the Item_func_group_concat class now correctly
      initializes the charset of the result string.
      
      
      mysql-test/t/func_gconcat.test:
        Added a test case for the bug#29850: Wrong charset of the GROUP_CONCAT result
        when the select employs a temporary table.
      mysql-test/r/func_gconcat.result:
        Added a test case for the bug#29850: Wrong charset of the GROUP_CONCAT result
        when the select employs a temporary table.
      sql/item_sum.cc:
        Bug#29850: Wrong charset of GROUP_CONCAT result when the select employs
        a temporary table.
        The copying constructor of the Item_func_group_concat class now correctly
        initializes the charset of the result string.
      134138bb
    • unknown's avatar
      After-merge fix for bug#14151. · 3fe13ea5
      unknown authored
      
      sql/sql_partition.cc:
        After-merge fix for bug#14151:
        This use of "md5.h" is new in 5.1 and must be changed to "my_md5.h" as well.
      3fe13ea5
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f95d1f07
      unknown authored
      into  mysql.com:/home/hf/work/29687/my51-29687
      
      f95d1f07
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 3785950f
      unknown authored
      into  mysql.com:/home/hf/work/29687/my51-29687
      
      3785950f
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8425b356
      unknown authored
      into  mysql.com:/home/hf/work/29687/my50-29687
      
      8425b356
    • unknown's avatar
      test case for memory leak added · 23666e3f
      unknown authored
      
      tests/mysql_client_test.c:
        test case added
      23666e3f
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 8a63be0d
      unknown authored
      into  mysql.com:/home/hf/work/29687/my50-29687
      
      8a63be0d
    • unknown's avatar
      Merge mysql.com:/home/hf/work/29687/my50-29687 · 888b2e9d
      unknown authored
      into  mysql.com:/home/hf/work/29687/my51-29687
      
      
      libmysql/libmysql.c:
        Auto merged
      888b2e9d
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint · b7c5c9b8
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.1-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      b7c5c9b8
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-4.1-maint · db2ccdea
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.0-maint
      
      db2ccdea
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 16d0f727
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      sql/sql_select.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      16d0f727
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1 · fe29a12e
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      client/mysqldump.c:
        Auto merged
      include/my_base.h:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      fe29a12e
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · cec66c3d
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/ha_myisam.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      cec66c3d
    • unknown's avatar
      Merge trift-lap.none:/MySQL/M50/bug14151-5.0 · 5b657b1a
      unknown authored
      into  trift-lap.none:/MySQL/M51/bug14151-5.1
      
      
      BitKeeper/deleted/.del-MySQL-Source.icc~edded3c3a5cf83b1:
        Auto merged
      BitKeeper/deleted/.del-mysqlmanager-pwgen.c~d8f5f91ec54432b9:
        Auto merged
      BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b:
        Auto merged
      include/Makefile.am:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      5b657b1a
    • unknown's avatar
      Avoid the name conflict between the system-provided "md5.h" and the MySQL one · decc3eec
      unknown authored
      by renaming "include/md5.h" to "include/my_md5.h".
      
      Fixes bug#14151.
      
      
      include/my_md5.h:
        Rename: include/md5.h -> include/my_md5.h
      decc3eec
    • unknown's avatar
      field.cc, field.h: · 52ad8a10
      unknown authored
        i5 compatibility
      
      
      sql/field.h:
        i5 compatibility
      sql/field.cc:
        i5 compatibility
      52ad8a10