unknown d52a1a144b Merge host.loc:/home/uchum/work/5.1-opt-33699 ...

into  host.loc:/home/uchum/work/5.1-opt


mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
  Merge with local tree (bug#33699).
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
  Merge with local tree (bug#33699).

2008-01-11 21:39:45 +04:00

..

loaddata_autocom_ndb.result

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

2007-06-27 14:28:02 +02: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

WL#3732 Information schema optimization

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

ndb_auto_increment.result

ndb_auto_increment.result:

2007-11-06 10:57:49 +01:00

ndb_basic.result

post merge weirdness

2007-10-26 09:06:18 +02:00

ndb_binlog_basic.result

Fixed errors found by pushbuild:

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

ndb_binlog_ddl_multi.result

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

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

ndb_binlog_discover.result

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

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

ndb_binlog_format.result

update bug dependency on failing test

2007-07-13 16:06:12 +02:00

ndb_binlog_ignore_db.result

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

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

ndb_binlog_log_bin.result

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

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

ndb_binlog_multi.result

Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main

2007-07-25 15:40:43 +02:00

ndb_bitfield.result

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

2007-06-27 14:28:02 +02: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_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

Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb

2007-10-04 18:37:49 +02: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#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02: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

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

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

ndb_dd_basic.result

Many files:

2007-10-27 01:40:48 +05:00

ndb_dd_ddl.result

Many files:

2007-10-27 01:40:48 +05: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

Many files:

2007-10-27 01:40:48 +05: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

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

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

ndb_index_unique.result

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

2007-12-07 11:05:19 +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#3933 Split main test suite to rpl, rpl_ndb and ndb

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

ndb_loaddatalocal.result

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

2007-06-27 14:28:02 +02: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

Bug #31484 Cluster LOST_EVENTS entry not added to binlog on mysqld restart.

2007-11-01 15:08:00 +01: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#3933 Split main test suite to rpl, rpl_ndb and ndb

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

ndb_partition_key.result

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

2007-06-27 14:28:02 +02: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

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

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

ndb_read_multi_range.result

manual merge

2007-08-21 14:41:50 +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#3933 Split main test suite to rpl, rpl_ndb and ndb

2007-06-27 14:28:02 +02: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

BUG#27543 Backup and restore can compatible with different endians for blob attribute

2007-09-05 13:01:30 +00:00

ndb_restore_partition.result

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

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

ndb_restore_print.result

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

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

ndb_restore.result

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

2007-08-28 15:47:12 +02:00

ndb_row_format.result

Many files:

2007-10-27 01:40:48 +05:00

ndb_single_user.result

Many files:

2007-10-27 01:40:48 +05: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_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

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

2007-07-04 22:38:53 +02: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

Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL

2008-01-11 05:06:08 +04: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