Alexander Nozdrin b3018e8613 Manual merge from mysql-trunk-merge. ...

Conflicts:
  - client/mysql.cc
  - client/mysqldump.c
  - configure.in
  - mysql-test/r/csv.result
  - mysql-test/r/func_time.result
  - mysql-test/r/show_check.result
  - mysql-test/r/sp-error.result
  - mysql-test/r/sp.result
  - mysql-test/r/sp_trans.result
  - mysql-test/r/type_blob.result
  - mysql-test/r/type_timestamp.result
  - mysql-test/r/warnings.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - sql/mysql_priv.h
  - sql/mysqld.cc
  - sql/sp.cc
  - sql/sql_base.cc
  - sql/sql_table.cc
  - sql/sql_trigger.cc
  - sql/sql_view.cc
  - sql/table.h
  - sql/share/errmsg.txt
  - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result

2010-02-24 16:52:27 +03:00

..

check_type.inc

WL#5151: Conversion between different types when replicating

2009-12-14 12:04:55 +01:00

create_recursive_construct.inc

Post-push fixes after wrong merge from 5.1->rep+2->rep+3.

2009-12-14 15:33:03 +01:00

rpl_auto_increment_insert_view.test

Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using trigger

2009-10-01 07:19:36 +08:00

rpl_auto_increment_invoke_trigger.test

Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using trigger

2009-10-01 07:19:36 +08:00

rpl_auto_increment.test

BUG#45999 Row based replication fails when auto_increment field = 0

2009-09-10 18:05:53 +08:00

rpl_autoinc_func_invokes_trigger.test

Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using trigger

2009-10-01 07:19:36 +08:00

rpl_binlog_max_cache_size.test

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

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

rpl_blackhole.test

Bug #38360: BLACKHOLE replication with RBR is broken

2008-10-02 21:13:15 +02:00

rpl_charset.test

WL#4738 streamline/simplify @@variable creation process

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

rpl_commit_after_flush.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_conflicts.test

BUG#37718: rpl.rpl_stm_mystery22 fails sporadically on pushbuild

2009-01-09 15:12:31 +01:00

rpl_ddl.test

Upmerge 5.0 -> 5.1 of fix for

2008-08-25 15:09:51 +02:00

rpl_deadlock.test

Bug#37716.

2009-04-04 01:33:13 +04:00

rpl_delete_no_where.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_EE_err.test

Merging 5.1 main into 5.1-rpl

2008-10-23 21:27:09 +02:00

rpl_extraMaster_Col.test

Bug #39265: fix for the bug 33699 should be reverted

2009-02-05 13:49:32 +04:00

rpl_extraSlave_Col.test

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

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

rpl_failed_optimize.test

BUG#44661: rpl_ndb.rpl_ndb_circular_simplex fails because of

2009-09-27 23:03:05 +01:00

rpl_flsh_tbls.test

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

rpl_foreign_key.test

BUG#39934: Slave stops for engine that only support row-based logging

2009-07-14 21:31:19 +02:00

rpl_get_master_version_and_clock.test

Bug #46931 rpl.rpl_get_master_version_and_clock fails on hpux11.31

2009-09-27 17:00:29 +08:00

rpl_implicit_commit_binlog.test

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

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

rpl_innodb.test

Merge next-mr -> next-4284.

2010-02-05 01:08:08 +03:00

rpl_insert_delayed.test

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

rpl_insert_id_pk.test

Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1

2007-06-06 10:57:07 -07:00

rpl_insert_id.test

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

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

rpl_insert_ignore.test

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

rpl_loaddata.test

Manual merge from mysql-trunk-merge.

2010-02-24 16:52:27 +03:00

rpl_loadfile.test

BUG#39701: Mixed binlog format does not switch to row mode on

2009-03-24 18:27:33 +00:00

rpl_log.test

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

rpl_max_relay_size.test

Fix for versional test

2008-01-14 15:38:02 +08:00

rpl_mixing_engines.inc

BUG#46364 MyISAM transbuffer problems (NTM problem)

2010-01-20 19:08:16 +00:00

rpl_mixing_engines.test

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

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

rpl_multi_query.test

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl

2007-03-29 21:38:03 +02:00

rpl_multi_update2.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_multi_update3.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_multi_update.test

…

rpl_ndb_2multi_basic.test

BUG#21842 (Cluster fails to replicate to innodb or myisam with err 134

2007-08-26 14:31:10 +02:00

rpl_ndb_2multi_eng.test

Problem: pushbuild has sporadic errors during startup of

2008-02-11 15:14:24 +01:00

rpl_ndb_apply_status.test

BUG#39934: Slave stops for engine that only support row-based logging

2009-07-14 21:31:19 +02:00

rpl_not_null.test

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

2009-10-22 01:19:52 +01:00

rpl_partition.test

…

rpl_relayrotate.test

fixes Bug #25305 (and several other similar test tailures with the same symptom)

2007-06-18 15:36:10 +02:00

rpl_reset_slave.test

BUG#48048: Deprecated constructs need removal in Betony

2009-11-04 12:28:20 +00:00

rpl_row_001.test

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

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

rpl_row_basic.test

WL#5151: Conversion between different types when replicating

2009-12-14 12:04:55 +01:00

rpl_row_blob.test

Backport for WL#4416

2009-11-27 02:32:01 +03:00

rpl_row_delayed_ins.test

BUG#29020 (Event results not correctly replicated to slave in RBR):

2008-03-28 13:16:41 +01:00

rpl_row_func003.test

Manual merge from mysql-trunk-merge.

2010-01-19 19:36:14 +03:00

rpl_row_sp002.test

Bug #32307 mysqltest - does not detect illegal if syntax

2008-08-04 12:38:50 +02:00

rpl_row_sp003.test

Backport for WL#4416

2009-11-27 02:32:01 +03:00

rpl_row_sp006.test

Backport fixes for the follow tests

2009-10-02 17:24:21 +08:00

rpl_row_sp007.test

…

rpl_row_tabledefs.test

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

2009-10-22 01:10:42 +01:00

rpl_row_UUID.test

BUG#28722 (Multi-engine statements on has_own_binlogging engine):

2007-06-22 01:39:23 +02:00

rpl_set_null.test

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

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

rpl_show_relaylog_events.inc

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

rpl_start_stop_slave.test

mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on the next step

2009-11-30 20:20:26 +02:00

rpl_stm_000001.test

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

2009-12-17 21:43:35 +00:00

rpl_stm_EE_err2.test

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

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

rpl_stop_middle_group.test

WL#2687 WL#5072 BUG#40278 BUG#47175

2009-11-03 19:02:56 +00:00

rpl_sv_relay_space.test

Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):

2006-04-19 15:29:49 +02:00

rpl_tmp_table_and_DDL.test

Bug #49132 Replication failure on temporary table + DDL

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

rpl_trig004.test

Backport for WL#4416

2009-11-27 02:32:01 +03:00

rpl_truncate_helper.test

Bug #36763

2009-02-06 17:06:41 +01:00

rpl_truncate.test

Bug #36763

2009-02-06 17:06:41 +01:00

type_conversions.test

BUG#49836: Replication of geometric fields is broken after WL#5151

2009-12-24 01:07:35 +00:00