database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity
202,617 Commits 3,133 Branches 363 Tags
11.4-mdev-36389-indexed-text-column-wrong-result
Commit Graph

18662 Commits

Author SHA1 Message Date
unknown
c4e4cd6df8 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
 2007-07-17 21:36:51 +02:00
joerg@trift2.
2285f9d7e1 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-07-17 21:36:51 +02:00
unknown
3e09e4adce Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
 2007-07-17 11:33:26 -06:00
tsmith@ramayana.hindu.god
23695e4e1e Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-07-17 11:33:26 -06:00
unknown
6e3d4f1c98 Post-merge fixes 
Disabled test cases that produce errors in a "server log".


mysql-test/t/disabled.def:
  Post-merge fixes
  Removed 'binlog_innodb' from the wrong disabled.def file.
 2007-07-17 09:25:01 +02:00
istruewing@chilla.local
ba177535f5 Post-merge fixes 
Disabled test cases that produce errors in a "server log".
 2007-07-17 09:25:01 +02:00
unknown
5f77904d4f Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1


configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
 2007-07-16 19:21:09 +02:00
joerg@trift-lap.fambruehe
125bc0ad54 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-07-16 19:21:09 +02:00
unknown
f3c857068d Post-merge fix 
Disabled a test that reports Slave SQL error in warnings file.
 2007-07-16 16:12:05 +02:00
istruewing@chilla.local
7f6bf17bab Post-merge fix 
Disabled a test that reports Slave SQL error in warnings file.
 2007-07-16 16:12:05 +02:00
unknown
9828ab7096 Post-merge fixes 
Disabled tests which break automatic merging due to
non-empty warnings file.
 2007-07-15 18:47:57 +02:00
istruewing@chilla.local
e819c326ed Post-merge fixes 
Disabled tests which break automatic merging due to
non-empty warnings file.
 2007-07-15 18:47:57 +02:00
unknown
bfa3d409bd Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_update.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
mysql-test/suite/parts/r/rpl_partition.result:
  Auto merged
mysql-test/suite/parts/t/rpl_partition.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
 2007-07-14 19:35:43 +02:00
istruewing@chilla.local
e307a089a9 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-14 19:35:43 +02:00
unknown
1d0749b858 Merge olga.mysql.com:/home/igor/mysql-5.1-rpl 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge


mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
 2007-07-13 23:54:41 -07:00
igor@olga.mysql.com
bec9500ec0 Merge olga.mysql.com:/home/igor/mysql-5.1-rpl 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
 2007-07-13 23:54:41 -07:00
unknown
a0cf0927af Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


mysql-test/suite/ndb/t/ndb_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_multi_row.test:
  Auto merged
 2007-07-13 22:22:02 +02:00
tomas@whalegate.ndb.mysql.com
b0aabc7940 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-13 22:22:02 +02:00
unknown
3a979065e9 Additional tests checking for symptoms observed within 
Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets


Makefile.am:
  Add execution of the ddl stress tests.
    (modified) test-bt: Short running variant added
    (new) test-ext-stress: Longer running variant
    (modified) test-ext: test-ext-stress added
    (modified) test-fast: Short running variant with MyISAM only added
  ---
  Declare test-ext-jp and test-ext-stress to PHONY make targets.
mysql-test/suite/stress/include/ddl.cln:
  Script for cleanup at execution end
mysql-test/suite/stress/include/ddl.pre:
  Script for general preparations at execution start
mysql-test/suite/stress/include/ddl1.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl2.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl3.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl4.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl5.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl6.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl7.inc:
  ddl stress script
mysql-test/suite/stress/include/ddl8.inc:
  ddl stress script
mysql-test/suite/stress/r/ddl_archive.result:
  File with expected results
mysql-test/suite/stress/r/ddl_csv.result:
  File with expected results
mysql-test/suite/stress/r/ddl_innodb.result:
  File with expected results
mysql-test/suite/stress/r/ddl_memory.result:
  File with expected results
mysql-test/suite/stress/r/ddl_myisam.result:
  File with expected results
mysql-test/suite/stress/r/ddl_ndb.result:
  File with expected results
mysql-test/suite/stress/t/ddl_archive.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_csv.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_innodb.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_memory.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_myisam.test:
  Storage engine specific toplevel testscript
mysql-test/suite/stress/t/ddl_ndb.test:
  Storage engine specific toplevel testscript
 2007-07-13 18:32:22 +02:00
mleich@three.local.lan
f1a6ad4dde Additional tests checking for symptoms observed within 
Bug28309 First insert violates unique constraint - was "memory" table empty ?
---
Add missing phony targets
 2007-07-13 18:32:22 +02:00
unknown
23ab9bd4db update bug dependency on failing test 
mysql-test/suite/ndb/t/ndb_binlog_format.test:
  Rename: mysql-test/t/ndb_binlog_format.test -> mysql-test/suite/ndb/t/ndb_binlog_format.test
mysql-test/suite/ndb/r/ndb_binlog_format.result:
  Rename: mysql-test/r/ndb_binlog_format.result -> mysql-test/suite/ndb/r/ndb_binlog_format.result
 2007-07-13 16:06:12 +02:00
tomas@whalegate.ndb.mysql.com
6ecee9d5da update bug dependency on failing test 2007-07-13 16:06:12 +02:00
unknown
b7af4c5b25 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
Streamlining test for RBR
 2007-07-11 04:33:19 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3a9e84826e Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
Streamlining test for RBR
 2007-07-11 04:33:19 +02:00
unknown
055b87b343 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/22540/51-22540


sql/log.cc:
  Auto merged
 2007-07-10 18:38:14 +02:00
tnurnberg@sin.intern.azundris.com
f1b5fa93ac Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:38:14 +02:00
unknown
523d4ddbd4 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
streamlining the test
 2007-07-10 18:31:50 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
bef7899334 Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
streamlining the test
 2007-07-10 18:31:50 +02:00
unknown
de904ce6e4 Merge mysql.com:/home/tnurnberg/22540/50-22540 
into  mysql.com:/home/tnurnberg/22540/51-22540


mysql-test/extra/binlog_tests/binlog.test:
  manual merge
mysql-test/suite/binlog/r/binlog_stm_binlog.result:
  manual merge
sql/log.cc:
  manual merge
 2007-07-10 18:21:06 +02:00
tnurnberg@sin.intern.azundris.com
9310ad5f48 Merge mysql.com:/home/tnurnberg/22540/50-22540 
into  mysql.com:/home/tnurnberg/22540/51-22540
 2007-07-10 18:21:06 +02:00
unknown
c9e0179557 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
 2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
810db44e4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-10 09:03:21 +02:00
unknown
20beacc9e1 Bug #29570 
- correct result files
 2007-07-10 09:00:15 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba Bug #29570 
- correct result files
 2007-07-10 09:00:15 +02:00
unknown
7350d52ce6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
 2007-07-09 10:33:33 -06:00
tsmith@sita.local
59c570ba78 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:33:33 -06:00
unknown
58353a7080 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  manual merge
 2007-07-09 12:07:33 +02:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:07:33 +02:00
unknown
407209c163 disabled.def: 
post-merge fix: re-enable rpl_udf test


mysql-test/suite/rpl/t/disabled.def:
  post-merge fix: re-enable rpl_udf test
 2007-07-09 03:31:27 -06:00
tsmith@sita.local
5cba44239a disabled.def: 
post-merge fix: re-enable rpl_udf test
 2007-07-09 03:31:27 -06:00
unknown
df0d80a31b Merge sita.local:/Users/tsmith/m/bk/51 
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_gis.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_row_format.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_single_user.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_incident.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge
mysql-test/t/csv.test:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
 2007-07-09 03:27:03 -06:00
tsmith@sita.local
5f12f35c34 Merge sita.local:/Users/tsmith/m/bk/51 
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
 2007-07-09 03:27:03 -06:00
unknown
5c60418104 Merge mysql.com:/home/ram/work/b29420/b29420.5.0 
into  mysql.com:/home/ram/work/b29420/b29420.5.1


sql/sql_repl.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Auto merged
 2007-07-07 12:04:11 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
f38158f401 Merge mysql.com:/home/ram/work/b29420/b29420.5.0 
into  mysql.com:/home/ram/work/b29420/b29420.5.1
 2007-07-07 12:04:11 +05:00
unknown
a7489ed189 Many tests have been moved to suite/*. Some tests have been removed. 
Update the disabled.def files to reflect actual contents of the t/* directories.

Also, move a few more tests into suite/*.


mysql-test/suite/parts/t/rpl_partition.test:
  Rename: mysql-test/t/rpl_partition.test -> mysql-test/suite/parts/t/rpl_partition.test
mysql-test/suite/parts/r/rpl_partition.result:
  Rename: mysql-test/r/rpl_partition.result -> mysql-test/suite/parts/r/rpl_partition.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt:
  Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test:
  Rename: mysql-test/t/rpl_ndb_ctype_ucs2_def.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_ctype_ucs2_def.test
mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt:
  Rename: mysql-test/t/rpl_ndb_mix_innodb-master.opt -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test:
  Rename: mysql-test/t/rpl_ndb_mix_innodb.test -> mysql-test/suite/rpl_ndb/t/rpl_ndb_mix_innodb.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result:
  Rename: mysql-test/r/rpl_ndb_ctype_ucs2_def.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_ctype_ucs2_def.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result:
  Rename: mysql-test/r/rpl_ndb_mix_innodb.result -> mysql-test/suite/rpl_ndb/r/rpl_ndb_mix_innodb.result
mysql-test/suite/ndb/t/disabled.def:
  Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/parts/t/disabled.def:
  Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/rpl/t/disabled.def:
  Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/suite/rpl_ndb/t/disabled.def:
  Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
mysql-test/t/disabled.def:
  Some tests have moved to suite/*, and some have been removed. Update disabled.def files to be consistent with actual t/* contents.
 2007-07-04 23:41:15 +02:00
tsmith@maint1.mysql.com
624f20da9f Many tests have been moved to suite/*. Some tests have been removed. 
Update the disabled.def files to reflect actual contents of the t/* directories.

Also, move a few more tests into suite/*.
 2007-07-04 23:41:15 +02:00
unknown
9e14ae9472 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51


client/mysqldump.c:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/suite/binlog/r/binlog_multi_engine.result:
  Auto merged
mysql-test/suite/binlog/t/binlog_multi_engine.test:
  Auto merged
mysql-test/suite/ndb/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_sp.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_trigger.result:
  Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
  Auto merged
mysql-test/suite/ndb/t/loaddata_autocom_ndb.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_alter_table.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_alter_table2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_alter_table3.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_autodiscover3.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_basic.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_binlog_log_bin.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_binlog_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_bitfield.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_blob.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_blob_partition.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cache_multi2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_charset.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_config.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_config2.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_cursor.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_database.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_alter.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_backuprestore.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_disk2memory.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_dump.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_dd_sql_features.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_gis.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_index.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_index_ordered.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_index_unique.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_limit.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_loaddatalocal.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_lock.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_minmax.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_multi.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_error.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_key.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_list.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_partition_range.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_read_multi_range.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_rename.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_replace.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_partition.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_print.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_row_format.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_sp.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_subquery.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_temporary.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_transaction.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_trigger.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_truncate.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_types.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
  Auto merged
mysql-test/suite/ndb/t/ndb_view.test:
  Auto merged
mysql-test/suite/ndb/t/ndbapi.test:
  Auto merged
mysql-test/suite/ndb/t/ps_7ndb.test:
  Auto merged
mysql-test/suite/ndb/t/strict_autoinc_5ndb.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_events.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_replicate_do.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_UUID.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_trigger.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_view.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt:
  Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/disabled.def:
  manual merge
  (Will need to follow up with moving a few test cases around post-merge)
 2007-07-04 22:38:53 +02:00
tsmith@maint1.mysql.com
54253a0763 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-07-04 22:38:53 +02:00
unknown
793c189667 rpl_misc_functions.result, rpl_misc_functions.test: 
Remove indeterministic behavior from a test


mysql-test/suite/rpl/r/rpl_misc_functions.result:
  Remove indeterministic behavior from a test
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Remove indeterministic behavior from a test
 2007-07-04 12:26:39 -06:00
tsmith@sita.local
3bcf0039a6 rpl_misc_functions.result, rpl_misc_functions.test: 
Remove indeterministic behavior from a test
 2007-07-04 12:26:39 -06:00