Alexander Nozdrin 85c54dddc7 Manual merge from mysql-5.1-bugteam. ...

Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_binlog_grant.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - mysql-test/suite/rpl/t/rpl_binlog_grant.test
  - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test

2010-01-30 22:13:36 +03:00

..

rpl_ndb_2innodb.result

Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output

2008-11-04 08:43:21 +01:00

rpl_ndb_2myisam.result

Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output

2008-11-04 08:43:21 +01:00

rpl_ndb_2ndb.result

correcting wrong test case

2008-02-11 15:06:07 +01:00

rpl_ndb_2other.result

BUG#38350: Many tests don't clean up after themselves on exit.

2008-11-13 20:19:00 +01:00

rpl_ndb_apply_status.result

Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status

2007-11-02 13:07:14 +01:00

rpl_ndb_auto_inc.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_bank.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_basic.result

backporting bug@27808 fixes

2009-10-01 19:44:53 +03:00

rpl_ndb_blob2.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_blob.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_circular_2ch.result

Bug #41732 rpl_ndb_circular_2ch needs an updated configuration file

2009-02-02 22:31:01 +02:00

rpl_ndb_circular_simplex.result

manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge

2009-10-22 23:30:28 +01:00

rpl_ndb_circular.result

backporting bug@27808 fixes

2009-10-01 19:44:53 +03:00

rpl_ndb_commit_afterflush.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_ctype_ucs2_def.result

BUG#38350: Many tests don't clean up after themselves on exit.

2008-11-13 20:19:00 +01:00

rpl_ndb_dd_basic.result

Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2

2007-06-27 14:29:10 +02:00

rpl_ndb_dd_partitions.result

Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output

2008-11-04 08:43:21 +01:00

rpl_ndb_ddl.result

Enabled test rpl_ndb_ddl

2007-12-11 11:51:14 +01:00

rpl_ndb_delete_nowhere.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_do_db.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_do_table.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_extraCol.result

BUG#48091 valgrind errors when slave has double not null and master has double null

2009-10-22 01:21:50 +01:00

rpl_ndb_func003.result

BUG#49222: Mark RAND() as unsafe

2010-01-13 10:00:03 +01:00

rpl_ndb_idempotent.result

backporting bug@27808 fixes

2009-10-01 19:44:53 +03:00

rpl_ndb_innodb2ndb.result

Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output

2008-11-04 08:43:21 +01:00

rpl_ndb_innodb_trans.result

WL#4189

2007-12-12 18:19:24 +01:00

rpl_ndb_insert_ignore.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_load.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_log.result

fixing tests results: rpl_ndb_log, rpl_ndb_multi, sp_trans_log; adding replicate-ignore_server_ids specific tests

2009-10-02 16:15:54 +03:00

rpl_ndb_mixed_engines_transactions.result

BUG#37373: rpl_ndb_transaction fails sporadically in pb on sol10-amd64-a and sol10-sparc-a

2008-07-06 12:53:25 +02:00

rpl_ndb_mixed_tables.result

Disabling tests that are not relevant after BUG#40116, these will be enabled

2009-09-28 13:44:45 +02:00

rpl_ndb_multi_update2.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_multi_update3.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_multi.result

fixing tests results: rpl_ndb_log, rpl_ndb_multi, sp_trans_log; adding replicate-ignore_server_ids specific tests

2009-10-02 16:15:54 +03:00

rpl_ndb_myisam2ndb.result

Bug#14326: No formatting of partitioning clause in SHOW CREATE TABLE output

2008-11-04 08:43:21 +01:00

rpl_ndb_relayrotate.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_rep_ignore.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_row_001.result

Use absolute path to allow tets to be run also when datadir differs

2007-12-19 09:42:31 +01:00

rpl_ndb_set_null.result

BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete:

2010-01-21 17:20:24 +00:00

rpl_ndb_sp003.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_sp006.result

Post fix result file

2009-10-03 09:40:32 +08:00

rpl_ndb_stm_innodb.result

Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam

2009-05-31 13:44:41 +08:00

rpl_ndb_sync.result

backporting bug@27808 fixes

2009-10-01 19:44:53 +03:00

rpl_ndb_trig004.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_ndb_UUID.result

Merge maint1.mysql.com:/data/localhome/tsmith/bk/51

2007-07-04 22:38:53 +02:00

rpl_ndbapi_multi.result

WL#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02:00

rpl_row_basic_7ndb.result

merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.

2008-11-12 19:51:47 +02:00

rpl_truncate_7ndb_2.result

Bug#39803 Test rpl.rpl_truncate_7ndb_2 failing

2008-09-15 15:13:43 -04:00

rpl_truncate_7ndb.result

WL#342 heartbeat

2009-09-29 14:16:23 +03:00