unknown
4908dec7e4
objects is only for internal use.
...
BitKeeper/deleted/.del-README.txt~97cdd3dccd3539d2:
Delete: mysql-test/suite/objects/README.txt
BitKeeper/deleted/.del-drop_all.inc:
Delete: mysql-test/suite/objects/include/drop_all.inc
BitKeeper/deleted/.del-objects.inc:
Delete: mysql-test/suite/objects/include/objects.inc
BitKeeper/deleted/.del-tbl01.inc:
Delete: mysql-test/suite/objects/include/tbl01.inc
BitKeeper/deleted/.del-tbl02.inc:
Delete: mysql-test/suite/objects/include/tbl02.inc
BitKeeper/deleted/.del-tbl03.inc:
Delete: mysql-test/suite/objects/include/tbl03.inc
BitKeeper/deleted/.del-tbl04.inc:
Delete: mysql-test/suite/objects/include/tbl04.inc
BitKeeper/deleted/.del-tbl05.inc:
Delete: mysql-test/suite/objects/include/tbl05.inc
BitKeeper/deleted/.del-tbl06.inc:
Delete: mysql-test/suite/objects/include/tbl06.inc
BitKeeper/deleted/.del-tbl07.inc:
Delete: mysql-test/suite/objects/include/tbl07.inc
BitKeeper/deleted/.del-tbl08.inc:
Delete: mysql-test/suite/objects/include/tbl08.inc
BitKeeper/deleted/.del-tbl09.inc:
Delete: mysql-test/suite/objects/include/tbl09.inc
BitKeeper/deleted/.del-tbl10.inc:
Delete: mysql-test/suite/objects/include/tbl10.inc
BitKeeper/deleted/.del-tbl11.inc:
Delete: mysql-test/suite/objects/include/tbl11.inc
BitKeeper/deleted/.del-tbl12.inc:
Delete: mysql-test/suite/objects/include/tbl12.inc
BitKeeper/deleted/.del-tbl13.inc:
Delete: mysql-test/suite/objects/include/tbl13.inc
BitKeeper/deleted/.del-tbl14.inc:
Delete: mysql-test/suite/objects/include/tbl14.inc
BitKeeper/deleted/.del-tbl15.inc:
Delete: mysql-test/suite/objects/include/tbl15.inc
BitKeeper/deleted/.del-tbl16.inc:
Delete: mysql-test/suite/objects/include/tbl16.inc
BitKeeper/deleted/.del-tbl17.inc:
Delete: mysql-test/suite/objects/include/tbl17.inc
BitKeeper/deleted/.del-tbl18.inc:
Delete: mysql-test/suite/objects/include/tbl18.inc
BitKeeper/deleted/.del-tbl19.inc:
Delete: mysql-test/suite/objects/include/tbl19.inc
BitKeeper/deleted/.del-tbl20.inc:
Delete: mysql-test/suite/objects/include/tbl20.inc
BitKeeper/deleted/.del-tbl21.inc:
Delete: mysql-test/suite/objects/include/tbl21.inc
BitKeeper/deleted/.del-tbl22.inc:
Delete: mysql-test/suite/objects/include/tbl22.inc
BitKeeper/deleted/.del-tbl23.inc:
Delete: mysql-test/suite/objects/include/tbl23.inc
BitKeeper/deleted/.del-tbl24.inc:
Delete: mysql-test/suite/objects/include/tbl24.inc
BitKeeper/deleted/.del-tbl25.inc:
Delete: mysql-test/suite/objects/include/tbl25.inc
BitKeeper/deleted/.del-tbl26.inc:
Delete: mysql-test/suite/objects/include/tbl26.inc
BitKeeper/deleted/.del-tbl27.inc:
Delete: mysql-test/suite/objects/include/tbl27.inc
BitKeeper/deleted/.del-tbl28.inc:
Delete: mysql-test/suite/objects/include/tbl28.inc
BitKeeper/deleted/.del-tbl29.inc:
Delete: mysql-test/suite/objects/include/tbl29.inc
BitKeeper/deleted/.del-tbl30.inc:
Delete: mysql-test/suite/objects/include/tbl30.inc
BitKeeper/deleted/.del-tbl31.inc:
Delete: mysql-test/suite/objects/include/tbl31.inc
BitKeeper/deleted/.del-tbl32.inc:
Delete: mysql-test/suite/objects/include/tbl32.inc
BitKeeper/deleted/.del-tbl33.inc:
Delete: mysql-test/suite/objects/include/tbl33.inc
BitKeeper/deleted/.del-tbl34.inc:
Delete: mysql-test/suite/objects/include/tbl34.inc
BitKeeper/deleted/.del-tbl35.inc:
Delete: mysql-test/suite/objects/include/tbl35.inc
BitKeeper/deleted/.del-tbl36.inc:
Delete: mysql-test/suite/objects/include/tbl36.inc
BitKeeper/deleted/.del-tbl37.inc:
Delete: mysql-test/suite/objects/include/tbl37.inc
BitKeeper/deleted/.del-tbl38.inc:
Delete: mysql-test/suite/objects/include/tbl38.inc
BitKeeper/deleted/.del-tbl39.inc:
Delete: mysql-test/suite/objects/include/tbl39.inc
BitKeeper/deleted/.del-tbl40.inc:
Delete: mysql-test/suite/objects/include/tbl40.inc
BitKeeper/deleted/.del-tbl41.inc:
Delete: mysql-test/suite/objects/include/tbl41.inc
BitKeeper/deleted/.del-tbl42.inc:
Delete: mysql-test/suite/objects/include/tbl42.inc
BitKeeper/deleted/.del-tbl43.inc:
Delete: mysql-test/suite/objects/include/tbl43.inc
BitKeeper/deleted/.del-tbl44.inc:
Delete: mysql-test/suite/objects/include/tbl44.inc
BitKeeper/deleted/.del-tbl45.inc:
Delete: mysql-test/suite/objects/include/tbl45.inc
BitKeeper/deleted/.del-tbl46.inc:
Delete: mysql-test/suite/objects/include/tbl46.inc
BitKeeper/deleted/.del-tbl47.inc:
Delete: mysql-test/suite/objects/include/tbl47.inc
BitKeeper/deleted/.del-tbl48.inc:
Delete: mysql-test/suite/objects/include/tbl48.inc
BitKeeper/deleted/.del-view.inc:
Delete: mysql-test/suite/objects/include/view.inc
BitKeeper/deleted/.del-objects_falcon.result:
Delete: mysql-test/suite/objects/r/objects_falcon.result
BitKeeper/deleted/.del-objects_falcon.test:
Delete: mysql-test/suite/objects/t/objects_falcon.test
BitKeeper/deleted/.del-objects_innodb.result:
Delete: mysql-test/suite/objects/r/objects_innodb.result
BitKeeper/deleted/.del-objects_innodb.test:
Delete: mysql-test/suite/objects/t/objects_innodb.test
2007-02-13 12:04:20 +01:00
unknown
aedf161dda
Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0
...
into mysql.com:/home/kent/bk/tmp3/mysql-5.1
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-README.txt:
Delete: mysql-test/suite/funcs_1/README.txt
BitKeeper/deleted/.del-memory_tb3.txt:
Delete: mysql-test/suite/funcs_1/data/memory_tb3.txt
BitKeeper/deleted/.del-myisam_storedproc_02.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_02.result
BitKeeper/deleted/.del-myisam_storedproc_03.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_03.result
BitKeeper/deleted/.del-myisam_storedproc_06.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
BitKeeper/deleted/.del-myisam_storedproc_07.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
BitKeeper/deleted/.del-myisam_storedproc_08.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
BitKeeper/deleted/.del-myisam_storedproc_10.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
BitKeeper/deleted/.del-myisam_trig_0102.result:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_0102.result
BitKeeper/deleted/.del-myisam_trig_03.result:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_03.result
BitKeeper/deleted/.del-myisam_trig_0407.result:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_0407.result
BitKeeper/deleted/.del-myisam_trig_08.result:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_08.result
BitKeeper/deleted/.del-memory_tb4.txt:
Delete: mysql-test/suite/funcs_1/data/memory_tb4.txt
BitKeeper/deleted/.del-myisam_trig_09.result:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_09.result
BitKeeper/deleted/.del-myisam_trig_1011ext.result:
Delete: mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
BitKeeper/deleted/.del-myisam_triggers.result:
Delete: mysql-test/suite/funcs_1/r/myisam_triggers.result
BitKeeper/deleted/.del-myisam_views.result:
Delete: mysql-test/suite/funcs_1/r/myisam_views.result
BitKeeper/deleted/.del-cleanup_sp_tb.inc:
Delete: mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc
BitKeeper/deleted/.del-load_sp_tb.inc:
Delete: mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc
BitKeeper/deleted/.del-storedproc_02.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_02.inc
BitKeeper/deleted/.del-storedproc_03.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_03.inc
BitKeeper/deleted/.del-storedproc_06.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
BitKeeper/deleted/.del-storedproc_07.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_07.inc
BitKeeper/deleted/.del-myisam_tb1.txt:
Delete: mysql-test/suite/funcs_1/data/myisam_tb1.txt
BitKeeper/deleted/.del-storedproc_08.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08.inc
BitKeeper/deleted/.del-storedproc_08_show.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_08_show.inc
BitKeeper/deleted/.del-storedproc_10.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
BitKeeper/deleted/.del-storedproc_master.inc:
Delete: mysql-test/suite/funcs_1/storedproc/storedproc_master.inc
BitKeeper/deleted/.del-a_version_check.test:
Delete: mysql-test/suite/funcs_1/t/a_version_check.test
BitKeeper/deleted/.del-disabled.def~1:
Delete: mysql-test/suite/funcs_1/t/disabled.def
BitKeeper/deleted/.del-innodb__datadict.test:
Delete: mysql-test/suite/funcs_1/t/innodb__datadict.test
BitKeeper/deleted/.del-innodb__load.test:
Delete: mysql-test/suite/funcs_1/t/innodb__load.test
BitKeeper/deleted/.del-innodb_bitdata.test:
Delete: mysql-test/suite/funcs_1/t/innodb_bitdata.test
BitKeeper/deleted/.del-innodb_cursors.test:
Delete: mysql-test/suite/funcs_1/t/innodb_cursors.test
BitKeeper/deleted/.del-myisam_tb2.txt:
Delete: mysql-test/suite/funcs_1/data/myisam_tb2.txt
BitKeeper/deleted/.del-innodb_func_view.test:
Delete: mysql-test/suite/funcs_1/t/innodb_func_view.test
BitKeeper/deleted/.del-innodb_storedproc.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc.test
BitKeeper/deleted/.del-innodb_storedproc_02.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_02.test
BitKeeper/deleted/.del-innodb_storedproc_03.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_03.test
BitKeeper/deleted/.del-innodb_storedproc_06.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_06.test
BitKeeper/deleted/.del-innodb_storedproc_07.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_07.test
BitKeeper/deleted/.del-innodb_storedproc_08.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_08.test
BitKeeper/deleted/.del-innodb_storedproc_10.test:
Delete: mysql-test/suite/funcs_1/t/innodb_storedproc_10.test
BitKeeper/deleted/.del-innodb_trig_0102.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_0102.test
BitKeeper/deleted/.del-innodb_trig_03.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_03.test
BitKeeper/deleted/.del-myisam_tb3.txt:
Delete: mysql-test/suite/funcs_1/data/myisam_tb3.txt
BitKeeper/deleted/.del-innodb_trig_0407.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_0407.test
BitKeeper/deleted/.del-innodb_trig_08.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_08.test
BitKeeper/deleted/.del-innodb_trig_09.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_09.test
BitKeeper/deleted/.del-innodb_trig_1011ext.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_1011ext.test
BitKeeper/deleted/.del-innodb_trig_frkey.test:
Delete: mysql-test/suite/funcs_1/t/innodb_trig_frkey.test
BitKeeper/deleted/.del-innodb_views.test:
Delete: mysql-test/suite/funcs_1/t/innodb_views.test
BitKeeper/deleted/.del-memory__datadict.test:
Delete: mysql-test/suite/funcs_1/t/memory__datadict.test
BitKeeper/deleted/.del-memory__load.test:
Delete: mysql-test/suite/funcs_1/t/memory__load.test
BitKeeper/deleted/.del-memory_bitdata.test:
Delete: mysql-test/suite/funcs_1/t/memory_bitdata.test
BitKeeper/deleted/.del-memory_cursors.test:
Delete: mysql-test/suite/funcs_1/t/memory_cursors.test
BitKeeper/deleted/.del-myisam_tb4.txt:
Delete: mysql-test/suite/funcs_1/data/myisam_tb4.txt
BitKeeper/deleted/.del-memory_func_view.test:
Delete: mysql-test/suite/funcs_1/t/memory_func_view.test
BitKeeper/deleted/.del-memory_storedproc.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc.test
BitKeeper/deleted/.del-memory_storedproc_02.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_02.test
BitKeeper/deleted/.del-memory_storedproc_03.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_03.test
BitKeeper/deleted/.del-memory_storedproc_06.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_06.test
BitKeeper/deleted/.del-memory_storedproc_07.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_07.test
BitKeeper/deleted/.del-memory_storedproc_08.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_08.test
BitKeeper/deleted/.del-memory_storedproc_10.test:
Delete: mysql-test/suite/funcs_1/t/memory_storedproc_10.test
BitKeeper/deleted/.del-memory_trig_0102.test:
Delete: mysql-test/suite/funcs_1/t/memory_trig_0102.test
BitKeeper/deleted/.del-memory_trig_03.test:
Delete: mysql-test/suite/funcs_1/t/memory_trig_03.test
BitKeeper/deleted/.del-t3.txt:
Delete: mysql-test/suite/funcs_1/data/t3.txt
BitKeeper/deleted/.del-memory_trig_0407.test:
Delete: mysql-test/suite/funcs_1/t/memory_trig_0407.test
BitKeeper/deleted/.del-memory_trig_08.test:
Delete: mysql-test/suite/funcs_1/t/memory_trig_08.test
BitKeeper/deleted/.del-memory_trig_09.test:
Delete: mysql-test/suite/funcs_1/t/memory_trig_09.test
BitKeeper/deleted/.del-memory_trig_1011ext.test:
Delete: mysql-test/suite/funcs_1/t/memory_trig_1011ext.test
BitKeeper/deleted/.del-memory_views.test:
Delete: mysql-test/suite/funcs_1/t/memory_views.test
BitKeeper/deleted/.del-myisam__datadict.test:
Delete: mysql-test/suite/funcs_1/t/myisam__datadict.test
BitKeeper/deleted/.del-myisam__load.test:
Delete: mysql-test/suite/funcs_1/t/myisam__load.test
BitKeeper/deleted/.del-myisam_bitdata.test:
Delete: mysql-test/suite/funcs_1/t/myisam_bitdata.test
BitKeeper/deleted/.del-myisam_cursors.test:
Delete: mysql-test/suite/funcs_1/t/myisam_cursors.test
BitKeeper/deleted/.del-myisam_func_view.test:
Delete: mysql-test/suite/funcs_1/t/myisam_func_view.test
BitKeeper/deleted/.del-t4.txt:
Delete: mysql-test/suite/funcs_1/data/t4.txt
BitKeeper/deleted/.del-myisam_storedproc.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc.test
BitKeeper/deleted/.del-myisam_storedproc_02.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_02.test
BitKeeper/deleted/.del-myisam_storedproc_03.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_03.test
BitKeeper/deleted/.del-myisam_storedproc_06.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_06.test
BitKeeper/deleted/.del-myisam_storedproc_07.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_07.test
BitKeeper/deleted/.del-myisam_storedproc_08.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_08.test
BitKeeper/deleted/.del-myisam_storedproc_10.test:
Delete: mysql-test/suite/funcs_1/t/myisam_storedproc_10.test
BitKeeper/deleted/.del-myisam_trig_0102.test:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_0102.test
BitKeeper/deleted/.del-myisam_trig_03.test:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_03.test
BitKeeper/deleted/.del-myisam_trig_0407.test:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_0407.test
BitKeeper/deleted/.del-t7.txt:
Delete: mysql-test/suite/funcs_1/data/t7.txt
BitKeeper/deleted/.del-myisam_trig_08.test:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_08.test
BitKeeper/deleted/.del-myisam_trig_09.test:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_09.test
BitKeeper/deleted/.del-myisam_trig_1011ext.test:
Delete: mysql-test/suite/funcs_1/t/myisam_trig_1011ext.test
BitKeeper/deleted/.del-myisam_views.test:
Delete: mysql-test/suite/funcs_1/t/myisam_views.test
BitKeeper/deleted/.del-trig_frkey.inc:
Delete: mysql-test/suite/funcs_1/triggers/trig_frkey.inc
BitKeeper/deleted/.del-trig_frkey2.inc:
Delete: mysql-test/suite/funcs_1/triggers/trig_frkey2.inc
BitKeeper/deleted/.del-triggers_0102.inc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_0102.inc
BitKeeper/deleted/.del-triggers_03.inc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_03.inc
BitKeeper/deleted/.del-triggers_0407.inc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_0407.inc
BitKeeper/deleted/.del-triggers_08.inc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_08.inc
BitKeeper/deleted/.del-t9.txt:
Delete: mysql-test/suite/funcs_1/data/t9.txt
BitKeeper/deleted/.del-triggers_09.inc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_09.inc
BitKeeper/deleted/.del-triggers_1011ext.inc:
Delete: mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
BitKeeper/deleted/.del-triggers_master.test:
Delete: mysql-test/suite/funcs_1/triggers/triggers_master.test
BitKeeper/deleted/.del-func_view.inc:
Delete: mysql-test/suite/funcs_1/views/func_view.inc
BitKeeper/deleted/.del-fv1.inc:
Delete: mysql-test/suite/funcs_1/views/fv1.inc
BitKeeper/deleted/.del-fv2.inc:
Delete: mysql-test/suite/funcs_1/views/fv2.inc
BitKeeper/deleted/.del-fv_cast.inc:
Delete: mysql-test/suite/funcs_1/views/fv_cast.inc
BitKeeper/deleted/.del-fv_if1.inc:
Delete: mysql-test/suite/funcs_1/views/fv_if1.inc
BitKeeper/deleted/.del-fv_if2.inc:
Delete: mysql-test/suite/funcs_1/views/fv_if2.inc
BitKeeper/deleted/.del-fv_ifnull.inc:
Delete: mysql-test/suite/funcs_1/views/fv_ifnull.inc
BitKeeper/deleted/.del-bitdata_master.test:
Delete: mysql-test/suite/funcs_1/bitdata/bitdata_master.test
BitKeeper/deleted/.del-datadict_bug_12777.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc
BitKeeper/deleted/.del-views_master.inc:
Delete: mysql-test/suite/funcs_1/views/views_master.inc
BitKeeper/deleted/.del-readme.txt~2:
Delete: mysql-test/suite/funcs_2/readme.txt
BitKeeper/deleted/.del-charset_master.test:
Delete: mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt:
Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc:
Delete: mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc:
Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc:
Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl:
Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
BitKeeper/deleted/.del-innodb_charset.result:
Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result:
Delete: mysql-test/suite/funcs_2/r/memory_charset.result
BitKeeper/deleted/.del-datadict_load.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_load.inc
BitKeeper/deleted/.del-myisam_charset.result:
Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result:
Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
BitKeeper/deleted/.del-innodb_charset.test:
Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test:
Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test:
Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test:
Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-datadict_master.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_master.inc
BitKeeper/deleted/.del-datadict_show_schema.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_show_schema.inc
BitKeeper/deleted/.del-datadict_show_table_design.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_show_table_design.inc
BitKeeper/deleted/.del-datadict_tables.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables.inc
BitKeeper/deleted/.del-datadict_tables_error.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error.inc
BitKeeper/deleted/.del-datadict_tables_error_1.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1.inc
BitKeeper/deleted/.del-datadict_tables_error_1044.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1044.inc
BitKeeper/deleted/.del-datadict_tables_error_1049.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1049.inc
BitKeeper/deleted/.del-cursors_master.test:
Delete: mysql-test/suite/funcs_1/cursors/cursors_master.test
BitKeeper/deleted/.del-datadict_tables_error_1051.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1051.inc
BitKeeper/deleted/.del-datadict_tables_error_1146.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1146.inc
BitKeeper/deleted/.del-datadict_tables_error_1288.inc:
Delete: mysql-test/suite/funcs_1/datadict/datadict_tables_error_1288.inc
BitKeeper/deleted/.del-create_database.inc:
Delete: mysql-test/suite/funcs_1/include/create_database.inc
BitKeeper/deleted/.del-create_user_lowest_priv.inc:
Delete: mysql-test/suite/funcs_1/include/create_user_lowest_priv.inc
BitKeeper/deleted/.del-create_user_no_super.inc:
Delete: mysql-test/suite/funcs_1/include/create_user_no_super.inc
BitKeeper/deleted/.del-innodb_tb1.inc:
Delete: mysql-test/suite/funcs_1/include/innodb_tb1.inc
BitKeeper/deleted/.del-innodb_tb2.inc:
Delete: mysql-test/suite/funcs_1/include/innodb_tb2.inc
BitKeeper/deleted/.del-innodb_tb3.inc:
Delete: mysql-test/suite/funcs_1/include/innodb_tb3.inc
BitKeeper/deleted/.del-innodb_tb4.inc:
Delete: mysql-test/suite/funcs_1/include/innodb_tb4.inc
BitKeeper/deleted/.del-innodb_tb1.txt:
Delete: mysql-test/suite/funcs_1/data/innodb_tb1.txt
BitKeeper/deleted/.del-memory_tb1.inc:
Delete: mysql-test/suite/funcs_1/include/memory_tb1.inc
BitKeeper/deleted/.del-memory_tb2.inc:
Delete: mysql-test/suite/funcs_1/include/memory_tb2.inc
BitKeeper/deleted/.del-memory_tb3.inc:
Delete: mysql-test/suite/funcs_1/include/memory_tb3.inc
BitKeeper/deleted/.del-memory_tb4.inc:
Delete: mysql-test/suite/funcs_1/include/memory_tb4.inc
BitKeeper/deleted/.del-myisam_tb1.inc:
Delete: mysql-test/suite/funcs_1/include/myisam_tb1.inc
BitKeeper/deleted/.del-myisam_tb2.inc:
Delete: mysql-test/suite/funcs_1/include/myisam_tb2.inc
BitKeeper/deleted/.del-myisam_tb3.inc:
Delete: mysql-test/suite/funcs_1/include/myisam_tb3.inc
BitKeeper/deleted/.del-myisam_tb4.inc:
Delete: mysql-test/suite/funcs_1/include/myisam_tb4.inc
BitKeeper/deleted/.del-show_connection.inc:
Delete: mysql-test/suite/funcs_1/include/show_connection.inc
BitKeeper/deleted/.del-sp_tb.inc:
Delete: mysql-test/suite/funcs_1/include/sp_tb.inc
BitKeeper/deleted/.del-innodb_tb2.txt:
Delete: mysql-test/suite/funcs_1/data/innodb_tb2.txt
BitKeeper/deleted/.del-DataGen_local.pl:
Delete: mysql-test/suite/funcs_1/lib/DataGen_local.pl
BitKeeper/deleted/.del-DataGen_modify.pl:
Delete: mysql-test/suite/funcs_1/lib/DataGen_modify.pl
BitKeeper/deleted/.del-a_version_check.result:
Delete: mysql-test/suite/funcs_1/r/a_version_check.result
BitKeeper/deleted/.del-innodb__datadict.result:
Delete: mysql-test/suite/funcs_1/r/innodb__datadict.result
BitKeeper/deleted/.del-innodb__load.result:
Delete: mysql-test/suite/funcs_1/r/innodb__load.result
BitKeeper/deleted/.del-innodb_bitdata.result:
Delete: mysql-test/suite/funcs_1/r/innodb_bitdata.result
BitKeeper/deleted/.del-innodb_cursors.result:
Delete: mysql-test/suite/funcs_1/r/innodb_cursors.result
BitKeeper/deleted/.del-innodb_func_view.result:
Delete: mysql-test/suite/funcs_1/r/innodb_func_view.result
BitKeeper/deleted/.del-innodb_storedproc.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc.result
BitKeeper/deleted/.del-innodb_storedproc_02.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_02.result
BitKeeper/deleted/.del-innodb_tb3.txt:
Delete: mysql-test/suite/funcs_1/data/innodb_tb3.txt
BitKeeper/deleted/.del-innodb_storedproc_03.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_03.result
BitKeeper/deleted/.del-innodb_storedproc_06.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
BitKeeper/deleted/.del-innodb_storedproc_07.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
BitKeeper/deleted/.del-innodb_storedproc_08.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
BitKeeper/deleted/.del-innodb_storedproc_10.result:
Delete: mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
BitKeeper/deleted/.del-innodb_trig_0102.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_0102.result
BitKeeper/deleted/.del-innodb_trig_03.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_03.result
BitKeeper/deleted/.del-innodb_trig_0407.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_0407.result
BitKeeper/deleted/.del-innodb_trig_08.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_08.result
BitKeeper/deleted/.del-innodb_trig_09.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_09.result
BitKeeper/deleted/.del-innodb_tb4.txt:
Delete: mysql-test/suite/funcs_1/data/innodb_tb4.txt
BitKeeper/deleted/.del-innodb_trig_1011ext.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
BitKeeper/deleted/.del-innodb_trig_frkey.result:
Delete: mysql-test/suite/funcs_1/r/innodb_trig_frkey.result
BitKeeper/deleted/.del-innodb_triggers.result:
Delete: mysql-test/suite/funcs_1/r/innodb_triggers.result
BitKeeper/deleted/.del-innodb_views.result:
Delete: mysql-test/suite/funcs_1/r/innodb_views.result
BitKeeper/deleted/.del-memory__datadict.result:
Delete: mysql-test/suite/funcs_1/r/memory__datadict.result
BitKeeper/deleted/.del-memory__load.result:
Delete: mysql-test/suite/funcs_1/r/memory__load.result
BitKeeper/deleted/.del-memory_bitdata.result:
Delete: mysql-test/suite/funcs_1/r/memory_bitdata.result
BitKeeper/deleted/.del-memory_cursors.result:
Delete: mysql-test/suite/funcs_1/r/memory_cursors.result
BitKeeper/deleted/.del-memory_func_view.result:
Delete: mysql-test/suite/funcs_1/r/memory_func_view.result
BitKeeper/deleted/.del-memory_storedproc.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc.result
BitKeeper/deleted/.del-memory_tb1.txt:
Delete: mysql-test/suite/funcs_1/data/memory_tb1.txt
BitKeeper/deleted/.del-memory_storedproc_02.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_02.result
BitKeeper/deleted/.del-memory_storedproc_03.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_03.result
BitKeeper/deleted/.del-memory_storedproc_06.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_06.result
BitKeeper/deleted/.del-memory_storedproc_07.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_07.result
BitKeeper/deleted/.del-memory_storedproc_08.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_08.result
BitKeeper/deleted/.del-memory_storedproc_10.result:
Delete: mysql-test/suite/funcs_1/r/memory_storedproc_10.result
BitKeeper/deleted/.del-memory_trig_0102.result:
Delete: mysql-test/suite/funcs_1/r/memory_trig_0102.result
BitKeeper/deleted/.del-memory_trig_03.result:
Delete: mysql-test/suite/funcs_1/r/memory_trig_03.result
BitKeeper/deleted/.del-memory_trig_0407.result:
Delete: mysql-test/suite/funcs_1/r/memory_trig_0407.result
BitKeeper/deleted/.del-memory_trig_08.result:
Delete: mysql-test/suite/funcs_1/r/memory_trig_08.result
BitKeeper/deleted/.del-memory_tb2.txt:
Delete: mysql-test/suite/funcs_1/data/memory_tb2.txt
BitKeeper/deleted/.del-memory_trig_09.result:
Delete: mysql-test/suite/funcs_1/r/memory_trig_09.result
BitKeeper/deleted/.del-memory_trig_1011ext.result:
Delete: mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
BitKeeper/deleted/.del-memory_triggers.result:
Delete: mysql-test/suite/funcs_1/r/memory_triggers.result
BitKeeper/deleted/.del-memory_views.result:
Delete: mysql-test/suite/funcs_1/r/memory_views.result
BitKeeper/deleted/.del-myisam__datadict.result:
Delete: mysql-test/suite/funcs_1/r/myisam__datadict.result
BitKeeper/deleted/.del-myisam__load.result:
Delete: mysql-test/suite/funcs_1/r/myisam__load.result
BitKeeper/deleted/.del-myisam_bitdata.result:
Delete: mysql-test/suite/funcs_1/r/myisam_bitdata.result
BitKeeper/deleted/.del-myisam_cursors.result:
Delete: mysql-test/suite/funcs_1/r/myisam_cursors.result
BitKeeper/deleted/.del-myisam_func_view.result:
Delete: mysql-test/suite/funcs_1/r/myisam_func_view.result
BitKeeper/deleted/.del-myisam_storedproc.result:
Delete: mysql-test/suite/funcs_1/r/myisam_storedproc.result
scripts/make_binary_distribution.sh:
SCCS merged
2007-02-12 23:37:12 +01:00
unknown
ad7c737ec4
Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-merge
...
into clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
dont see anything here, use local
2007-02-12 21:13:19 +01:00
unknown
2abc977de9
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-02-09 12:53:53 +01:00
unknown
a4727936d5
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/push-5.1
BitKeeper/etc/ignore:
auto-union
2007-02-09 12:32:26 +01:00
unknown
8bdc141f7e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-build
BitKeeper/etc/ignore:
auto-union
2007-02-09 12:23:43 +01:00
unknown
135d025687
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
BitKeeper/etc/ignore:
auto-union
2007-02-09 12:08:41 +01:00
unknown
906a4842d5
make_binary_distribution.sh:
...
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
scripts/make_binary_distribution.sh:
Copy "ndb_size.tmpl" into binary distribution (Bug#24191)
2007-02-09 00:10:40 +01:00
unknown
fc71108a8b
updates caused by 5.1.16
...
BitKeeper/etc/ignore:
Added mysql-test/partitions.log mysql-test/rpl.log to the ignore list
2007-02-08 10:03:17 +01:00
unknown
1daa0e4435
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
2007-02-08 00:00:14 +07:00
unknown
1c3b070772
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-02-07 13:42:49 +01:00
unknown
a11fb9ebc4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-02-07 12:33:36 +01:00
unknown
7d678ab9d6
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
2007-02-07 12:29:34 +01:00
unknown
452038579b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 12:06:13 +01:00
unknown
e7c4bc626d
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
2007-02-07 11:44:41 +01:00
unknown
0690e39b2a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
sql/ha_ndbcluster.h:
SCCS merged
2007-02-07 11:40:43 +01:00
unknown
384c13043a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-07 17:37:10 +07:00
unknown
c8f470eaa6
NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc:
...
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
Removed stray mthod declaration
sql/ha_ndbcluster.h:
Removed stray mthod declaration
ndb/include/ndbapi/NdbScanOperation.hpp:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ndb/src/ndbapi/NdbScanOperation.cpp:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
sql/ha_ndbcluster.cc:
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
2007-02-07 11:36:34 +01:00
unknown
f1882c1fc1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-07 17:01:31 +07:00
unknown
5d00f96100
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 09:52:10 +01:00
unknown
310d70a3e6
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: added original test case
2007-02-07 09:49:16 +01:00
unknown
6e393bdb1b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-02-07 09:37:18 +01:00
unknown
17f82aa343
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
2007-02-07 09:32:34 +01:00
unknown
f3463a8c82
bug#25821 Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value
2007-02-07 09:19:33 +01:00
unknown
cef338ec15
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
2007-02-06 23:48:53 +01:00
unknown
fd2c17db94
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
SCCS merged
2007-02-06 23:42:24 +01:00
unknown
ba8a684dcb
Fix for bug#25821 Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range
2007-02-06 23:06:58 +01:00
unknown
efc2771dde
Excluded wrongly merged changeset.
2007-02-07 01:37:21 +04:00
unknown
b2f415d3eb
Bug#26015 valgrind warning PollGuard::unlock_and_signal()/NdbCondition_Destroy
...
- Add variable "ndbcluster_binlog_terminating" and use that to signal
the cluster binlog thread it's time to shutdown. This allows
exact control of when the thread shutdown, previous implementation
would start shutdown of the thread as soon as the mysqld started
shutdown. Now we will shutdown cluster binlog thread
in 'ndbcluster_binlog_end'
sql/ha_ndbcluster_binlog.cc:
Make binlog thread shutdown controllable by using a separet variable
to communicate the order to shutdown
2007-02-06 22:06:13 +01:00
unknown
630091fed4
copy from test-extra-5.0 to main tree
...
BitKeeper/etc/ignore:
Added mysql-test/mysql-test-run-shell to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
finished files with newline
2007-02-06 19:07:48 +01:00
unknown
ee5eb8bbe1
copy from test-extra-5.1 to main tree
...
BitKeeper/etc/ignore:
Added mysql-test/suite/funcs_1/r/innodb_views.warnings mysql-test/suite/funcs_1/r/memory_trig_03e.warnings mysql-test/suite/funcs_1/r/memory_views.warnings mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings mysql-test/suite/partitions/r/diff mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings storage/archive/archive_reader mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings to the ignore list
mysql-test/suite/funcs_2/include/check_charset.inc:
inserted newline at the end of file.
mysql-test/suite/objects/include/drop_all.inc:
inserted newline at the end of file.
mysql-test/suite/partitions/include/partition_key_32col.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/data/rpl_mixed.dat:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_event.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_user.inc:
inserted newline at the end of file.
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
inserted newline at the end of file.
2007-02-06 13:35:54 +01:00
unknown
bc365a8b51
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
2007-02-06 15:02:48 +07:00
unknown
8768482447
ndb: only inject events (ACTIVE, NODE_FAILURE, CLUSTER_FAILURE) if bit shows connected
2007-02-06 15:01:24 +07:00
unknown
95edb7dd67
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
2007-02-06 15:00:19 +07:00
unknown
b057014875
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster_binlog.cc:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
2007-02-06 12:45:42 +07:00
unknown
df3494ca51
Bug #26021 - ndb: valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
...
sql/ha_ndbcluster.cc:
Bug #26021 : make sure ndbcluster_create_event_ops even if no binlogging as flags NSF_NO_BINLOG is set there
set NSS_DROPPED state in handle_trailing_share if appropriate
added dbug printout and comments for NDB_SHARE references
sql/ha_ndbcluster_binlog.cc:
Bug #26021 : set NSF_NO_BINLOG if !ndb_binlog_running
Bug #26021 : only reuse share if share_may_exist
setup apply_status table to be logged always, even if no binlogging
added dbug printout and comments for NDB_SHARE references
2007-02-06 12:40:26 +07:00
unknown
c0cc946885
ndb: remove WAITFOR_RESPONSE_TIMEOUT printout
...
- to get cleaner error log in debug mode
storage/ndb/src/ndbapi/TransporterFacade.cpp:
remove WAITFOR_RESPONSE_TIMEOUT printout
2007-02-06 11:57:56 +07:00
unknown
949381c2c8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
2007-02-05 21:50:39 +01:00
unknown
3a8a328e61
ndb - some more hugo abort option fix
...
storage/ndb/test/src/HugoTransactions.cpp:
restore some accidently removed hugo code
storage/ndb/test/src/UtilTransactions.cpp:
one more abort option fix
2007-02-05 21:38:16 +01:00
unknown
598b8dfd0f
ndb -
...
Add abort option to lots of Hugo code,
as it assumes it and default value has changed
storage/ndb/test/src/HugoTransactions.cpp:
Add abort option to lots of Hugo code,
as it assumes it and default value has changed
storage/ndb/test/src/UtilTransactions.cpp:
Add abort option to lots of Hugo code,
as it assumes it and default value has changed
2007-02-05 20:28:11 +01:00
unknown
0a27a90ab4
ndb - bug#25801
...
- improve error message if starting wo/ enough REDO
- decrease likelyhood of trying to start too early
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Add new error code (that maybe should have been there a looong time)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Add new check (during SR) for that sufficient REDO is present
before continuing SR
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Add list of GCI's of nodes so that we can check for sufficient REDO during a SR
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Add check for REDO during SR
so that
1) cluster is not trying to start too soon
2) a better error message (than internal error) is provided if not enough REDO is present
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Add new error code (that maybe should have been there a looong time)
2007-02-05 19:47:19 +01:00
unknown
72d99ac243
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster_binlog.cc:
Auto merged
2007-02-06 00:10:56 +07:00
unknown
fa839ece57
Bug #26021 valgrind warning handle_trailing_share/ndbcluster_free_share invalid read
...
- revert bugfix, needs more work
2007-02-06 00:09:45 +07:00
unknown
891222d105
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-02-06 00:07:39 +07:00
unknown
c52165de13
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Manually merged.
2007-02-05 15:31:20 +04:00
unknown
e3ddf9259a
Fix false Valgrind warning.
...
On some compiler/platform combination, an assignment of form *p= *p
would map to a memcpy() call, and Valgrind flags this as an overlapped
memcpy() error.
Fix by prefixing *p= *q with if(p!=q) when building for Valgrind
(HAVE_purify).
sql/sql_select.cc:
Fix false valgrind warning.
2007-02-05 10:50:08 +01:00
unknown
2b39a66d80
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
2007-02-05 13:22:33 +07:00
unknown
dd01c46f36
Bug #26021 - valgrind reports error regarding handle_trailing_share and client thread share usage
...
- add ndb_share connect_count to decide if share can be reused to setup replication
sql/ha_ndbcluster.cc:
add additional logging info
remove inline real_free_share (not needed) and confuses valgrind printout
sql/ha_ndbcluster.h:
add connect_count to ndb_share to enable checking for version of share
sql/ha_ndbcluster_binlog.cc:
use ndb_share connect_count to decide if share can be reused to setup replication
- share will be created early if table is accessed prior to handler setting up binlog stuff, see bug 26021
sql/ha_ndbcluster_binlog.h:
remove inline real_free_share (not needed) and confuses valgrind printout
2007-02-05 13:21:18 +07:00
unknown
4db67f5106
Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster_binlog.cc:
Auto merged
2007-02-05 13:10:24 +07:00
unknown
af9d2e2437
corrected merge error
2007-02-05 12:51:45 +07:00
