mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/suite/binlog/r
History
Alexey Kopytov d95c1e3b47 Manual merge of mysql-trunk into mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/Makefile.am
Text conflict in mysql-test/collections/default.daily
Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
Text conflict in mysys/charset.c
Text conflict in sql/field.cc
Text conflict in sql/field.h
Text conflict in sql/item.h
Text conflict in sql/item_func.cc
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/rpl_utility.cc
Text conflict in sql/rpl_utility.h
Text conflict in sql/set_var.cc
Text conflict in sql/share/Makefile.am
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_plugin.cc
Text conflict in sql/sql_select.cc
Text conflict in sql/sql_table.cc
Text conflict in storage/example/ha_example.h
Text conflict in storage/federated/ha_federated.cc
Text conflict in storage/myisammrg/ha_myisammrg.cc
Text conflict in storage/myisammrg/myrg_open.c
2010-03-24 18:03:44 +03:00
..
binlog_base64_flag.result merged 5.1 main to 5.1-rpl 2008-08-04 07:04:47 +02:00
binlog_database.result merge mysql-next-mr --> mysql-5.1-rpl-merge 2010-01-14 16:02:55 +00:00
binlog_delete_and_flush_index.result BUG#34582: FLUSH LOGS does not close and reopen the binlog index 2009-10-20 09:39:40 +01:00
binlog_format_switch_in_tmp_table.result Bug #45855 row events in binlog after switch from binlog_fmt=mix to stmt with open tmp tbl 2010-01-26 17:41:15 +08:00
binlog_grant.result WL#4738 streamline/simplify @@variable creation process 2009-12-22 10:35:56 +01:00
binlog_implicit_commit.result Bug #37221: SET AUTOCOMMIT=1 does not commit binary log 2009-09-23 13:20:48 +02:00
binlog_incident.result Bug#46010 main.ctype_gbk_binlog fails sporadically : Table 't2' already exists 2009-09-07 13:42:54 +08:00
binlog_index.result BUG#49638 binlog_index fails in mysql-trunk-merge 2009-12-16 19:52:56 +00:00
binlog_innodb.result BUG#50038 Deadlock on flush logs with concurrent DML and RBR 2010-01-05 16:55:23 +00:00
binlog_innodb_row.result Post-push fix for BUG#51251. 2010-03-09 23:41:21 +00:00
binlog_killed.result merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-17 21:43:35 +00:00
binlog_killed_simulate.result Manual merge from mysql-trunk-merge. 2010-01-19 19:36:14 +03:00
binlog_max_extension.result BUG#40611: MySQL cannot make a binary log after sequential number 2009-11-22 03:59:48 +00:00
binlog_mix_innodb_stat.result BUG#50038 Deadlock on flush logs with concurrent DML and RBR 2010-01-05 16:55:23 +00:00
binlog_multi_engine.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
binlog_old_versions.result BUG#34141: mysqlbinlog cannot read 4.1 binlogs containing load data infile 2008-01-30 14:12:40 +01:00
binlog_row_binlog.result merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 2009-11-06 18:35:04 +02:00
binlog_row_ctype_cp932.result Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
binlog_row_ctype_ucs.result Bug#41371 Select returns 1 row with condition "col is not null and col is null" 2009-11-03 17:54:41 +04:00
binlog_row_drop_tbl.result Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5, 2009-12-05 02:02:48 +03:00
binlog_row_drop_tmp_tbl.result Manual Merge 2009-11-03 18:20:08 +08:00
binlog_row_innodb_stat.result BUG#50038 Deadlock on flush logs with concurrent DML and RBR 2010-01-05 16:55:23 +00:00
binlog_row_insert_select.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
binlog_row_mix_innodb_myisam.result Manual merge of mysql-trunk into mysql-trunk-merge. 2010-03-24 18:03:44 +03:00
binlog_row_mysqlbinlog_db_filter.result BUG#42941: --database paramater to mysqlbinlog fails with RBR 2009-06-07 23:28:08 +01:00
binlog_row_mysqlbinlog_verbose.result Attempt to fix Windows testcase output issue 2009-10-14 21:25:11 +08:00
binlog_sql_mode.result BUG#39526 sql_mode not retained in binary log for CREATE PROCEDURE 2009-02-28 09:35:18 +08:00
binlog_start_comment.result Fix after merge 2008-02-28 18:55:46 +01:00
binlog_statement_insert_delayed.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
binlog_stm_binlog.result merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment 2009-11-10 20:45:15 +02:00
binlog_stm_blackhole.result Patch for WL#3736: Extended Table, Column and Index Comments. 2010-02-20 13:07:32 +03:00
binlog_stm_ctype_cp932.result Merge stella.local:/home2/mydev/mysql-5.1-amain 2008-03-26 10:27:00 +01:00
binlog_stm_ctype_ucs.result merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2010-01-07 15:39:11 +00:00
binlog_stm_do_db.result merging 5.1->rep+2->rep+3 2009-12-02 14:17:07 +02:00
binlog_stm_drop_tbl.result Merge next-mr -> next-4284. 2010-02-05 01:08:08 +03:00
binlog_stm_drop_tmp_tbl.result Manual Merge 2009-11-03 18:20:08 +08:00
binlog_stm_innodb_stat.result BUG#50038 Deadlock on flush logs with concurrent DML and RBR 2010-01-05 16:55:23 +00:00
binlog_stm_insert_select.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
binlog_stm_mix_innodb_myisam.result Manual merge from mysql-next-mr. 2010-02-15 14:16:49 +03:00
binlog_stm_ps.result WL#2687 WL#5072 BUG#40278 BUG#47175 2009-11-03 19:02:56 +00:00
binlog_stm_row.result merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 2009-12-17 21:43:35 +00:00
binlog_stm_unsafe_warning.result Bug #50192 Strange effect in replication test, trigger, auto_increment 2010-01-29 15:55:35 +02:00
binlog_stm_user_variables.result BUG#49562: SBR out of sync when using numeric data types + user 2010-01-19 23:16:22 +00:00
binlog_switch_inside_trans.result Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing. 2010-02-02 10:56:42 +03:00
binlog_tmp_table.result Manual merge of mysql-trunk into mysql-trunk-merge. 2010-03-24 18:03:44 +03:00
binlog_truncate_innodb.result Bug #36763 2009-02-06 17:06:41 +01:00
binlog_truncate_myisam.result Bug #36763 2009-02-10 22:26:37 +01:00
binlog_unsafe.result Merge next-mr -> next-4284-merge. 2010-02-04 20:34:15 +03:00
binlog_write_error.result Merge next-mr -> next-4284. 2010-02-04 23:15:47 +03:00