Konstantin Osipov a72f90bc43 Merge next-mr -> next-4284. ...

mysql-test/t/disabled.def:
  Restore disabled ssl tests: SSL certificates were updated.
  Disable sp_sync.test, the test case can't work in next-4284.
mysql-test/t/partition_innodb.test:
  Disable parsing of the test case for Bug#47343, 
  the test can not work in next-4284.
mysql-test/t/ps_ddl.test:
  Update results (CREATE TABLE IF NOT EXISTS takes
  into account existence of the temporary table).

2010-02-06 13:28:06 +03:00

..

loaddata_autocom_ndb.result

WL#4189

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

ndb_alter_table2.result

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

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

ndb_alter_table3.result

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

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

ndb_alter_table.result

bug #31231 mysql_alter_table() tries to drop a non-existing table

2008-09-15 11:19:56 +02:00

ndb_auto_increment.result

ndb_restore.result, ndb_restore.test:

2008-01-25 10:43:30 +01:00

ndb_autoinc.result

Shouldn't let the non-deterministic temperary filename output in result file for bug#30417

2008-01-10 17:39:50 +08:00

ndb_basic.result

WL#4738 streamline/simplify @@variable creation process

2009-12-22 10:35:56 +01:00

ndb_binlog_basic.result

Fixed errors found by pushbuild:

2007-08-16 16:47:31 +03:00

ndb_binlog_ddl_multi.result

Update name of binlog file for ndb_binlog* tests

2007-12-19 17:16:22 +01:00

ndb_binlog_discover.result

Update name of binlog file for ndb_binlog* tests

2007-12-19 17:16:22 +01:00

ndb_binlog_format.result

Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.

2010-02-02 10:56:42 +03:00

ndb_binlog_ignore_db.result

Update name of binlog file for ndb_binlog* tests

2007-12-19 17:16:22 +01:00

ndb_binlog_log_bin.result

Update name of binlog file for ndb_binlog* tests

2007-12-19 17:16:22 +01:00

ndb_binlog_multi.result

Update name of binlog file for ndb_binlog* tests

2007-12-19 17:16:22 +01:00

ndb_bitfield.result

WL#2110 (SIGNAL)

2009-09-10 03:18:29 -06:00

ndb_blob_partition.result

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

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

ndb_blob.result

backport test for bug#30674

2007-12-10 13:29:23 +01:00

ndb_bug26793.result

rpl_ndb_dd_partitions-slave.opt:

2007-08-21 16:26:00 +02:00

ndb_bug31477.result

ndb - bug#31477 - in 5.1 move ndb_bug31477.test to suite/ndb

2008-01-29 15:02:03 +01:00

ndb_cache2.result

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

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

ndb_cache_multi2.result

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

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

ndb_cache_multi.result

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

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

ndb_cache.result

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

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

ndb_charset.result

bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

2007-12-07 11:05:19 +01:00

ndb_condition_pushdown.result

WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"

2010-01-06 11:54:45 +01:00

ndb_config2.result

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

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

ndb_config.result

WL#4189

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

ndb_cursor.result

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

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

ndb_database.result

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

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

ndb_dd_alter.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

ndb_dd_basic.result

minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase better

2009-12-22 12:02:52 +01:00

ndb_dd_ddl.result

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

2010-01-07 15:39:11 +00:00

ndb_dd_disk2memory.result

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

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

ndb_dd_dump.result

ndb_dd_dump.test, ndb_dd_dump.result:

2007-08-21 21:22:35 +02:00

ndb_dd_sql_features.result

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

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

ndb_gis.result

WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"

2010-01-06 11:54:45 +01:00

ndb_grant.result

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

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

ndb_index_ordered.result

Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5,

2009-12-05 02:02:48 +03:00

ndb_index_unique.result

WL#5197 "Move @@engine_condition_pushdown to @@optimizer_switch"

2010-01-06 11:54:45 +01:00

ndb_index.result

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

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

ndb_insert.result

Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb

2007-11-05 21:11:15 +01:00

ndb_limit.result

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

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

ndb_load.result

WL#4189

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

ndb_loaddatalocal.result

WL#4189

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

ndb_lock_table.result

BUG#30996: Committed too early when autocommit and lock table

2007-09-14 00:10:47 +02:00

ndb_lock.result

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

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

ndb_minmax.result

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

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

ndb_multi_row.result

Post merge fixes

2009-09-11 01:15:41 -06:00

ndb_multi.result

workaround for case insensitive filesystems

2007-11-05 13:33:20 +01:00

ndb_partition_error2.result

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

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

ndb_partition_error.result

WL#2110 (SIGNAL)

2009-09-10 03:18:29 -06:00

ndb_partition_key.result

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

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

ndb_partition_list.result

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

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

ndb_partition_range.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

ndb_read_multi_range.result

Drop all tables before test case ends

2008-04-11 15:32:34 +02:00

ndb_rename.result

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

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

ndb_replace.result

WL#4189

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

ndb_restore_compat.result

Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb

2007-08-30 16:17:32 +08:00

ndb_restore_different_endian_data.result

Backport of WL #2934: Make/find library for doing float/double

2009-12-22 19:23:13 +03:00

ndb_restore_partition.result

Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.

2009-03-16 17:36:14 -04:00

ndb_restore_print.result

merge 5.0 -> 5.1

2009-03-15 18:39:48 -04:00

ndb_restore.result

Bug#35427 INFORMATION_SCHEMA.TABLES.TABLE_CATALOG is NULL, should be "def"

2009-10-23 16:02:20 +05:00

ndb_row_format.result

WL#2110 (SIGNAL)

2009-09-10 03:18:29 -06:00

ndb_single_user.result

WL#2110 (SIGNAL)

2009-09-10 03:18:29 -06:00

ndb_sp.result

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

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

ndb_subquery.result

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

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

ndb_temporary.result

WL#3732 Information schema optimization

2007-08-03 03:14:05 +05:00

ndb_tmp_table_and_DDL.result

Bug #49132 Replication failure on temporary table + DDL

2010-01-22 17:38:21 +08:00

ndb_transaction.result

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

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

ndb_trigger.result

WL#4189

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

ndb_truncate.result

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

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

ndb_types.result

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

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

ndb_update_no_read.result

commit of WL#3686 test case already in 5.1 to get regression testing, no code committed

2007-10-26 11:42:33 +02:00

ndb_update.result

bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes

2007-12-07 11:05:19 +01:00

ndb_view.result

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

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

ndbapi.result

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

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

ps_7ndb.result

Backport of WL #2934: Make/find library for doing float/double

2009-12-22 19:23:13 +03:00

strict_autoinc_5ndb.result

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

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