mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-08 08:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity
mariadb/mysql-test/suite/binlog/r
History
Luis Soares f1bb8c3c55 manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 
Conflicts
=========

Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.

NOTE
====
 mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
 - "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"

 This is the first cset (merge/...) committed after pulling 
 from mysql-next-mr.
2009-10-22 23:30:28 +01:00
..
binlog_auto_increment_bug33029.result Bug #40559 assertion failed in check_binlog_magic 2009-03-06 20:19:29 +02: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 BUG#43263 from 5.0-bugteam to 5.1-bugteam 2009-05-31 13:44:41 +08:00
binlog_grant.result Backport Post fix of result files after push of BUG#34227 2009-10-02 17:12:10 +08: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 WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00
binlog_innodb.result WL#342 heartbeat 2009-09-29 14:16:23 +03:00
binlog_innodb_row.result Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam 2009-05-31 13:44:41 +08:00
binlog_killed.result Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags 2007-11-06 20:41:06 +02:00
binlog_killed_simulate.result Bug#43746: YACC return wrong query string when parse 'load data infile' sql statement 2009-09-28 05:41:10 -07:00
binlog_mix_innodb_stat.result Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust 2008-09-22 15:15:52 -04:00
binlog_mixed_failure_mixing_engines.result BUG#47678 Changes to n-tables that happen early in a trans. are only flushed upon commit 2009-10-06 01:54:00 +01:00
binlog_multi_engine.result Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam 2009-05-31 13:44:41 +08: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 manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01: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 Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam 2009-05-31 13:44:41 +08:00
binlog_row_drop_tmp_tbl.result BUG #46572 DROP TEMPORARY table IF EXISTS does not have a consistent behavior in ROW mode 2009-09-28 10:23:06 +08:00
binlog_row_failure_mixing_engines.result BUG#47678 Changes to n-tables that happen early in a trans. are only flushed upon commit 2009-10-06 01:54:00 +01:00
binlog_row_innodb_stat.result Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust 2008-09-22 15:15:52 -04:00
binlog_row_insert_select.result Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam 2009-05-31 13:44:41 +08:00
binlog_row_mix_innodb_myisam.result mysql-5.1-bugteam (local) --> mysql-5.1-bugteam 2009-10-06 11:25:36 +01: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 BUG#38068: binlog_stm_binlog fails sporadically in pushbuild 2008-07-29 17:36:13 +02:00
binlog_stm_binlog.result manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge 2009-10-22 23:30:28 +01:00
binlog_stm_blackhole.result Bug#43746: YACC return wrong query string when parse 'load data infile' sql statement 2009-09-28 05:41:10 -07: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 BUG#34541: mysqlbinlog prints 'set;' in stm mode after changing autocommit mode 2008-04-02 16:49:22 +07:00
binlog_stm_drop_tmp_tbl.result BUG #46572 DROP TEMPORARY table IF EXISTS does not have a consistent behavior in ROW mode 2009-09-28 10:23:06 +08:00
binlog_stm_innodb_stat.result Bug#37312 Make tests binlog_row_innodb_stat and binlog_stm_innodb_stat more robust 2008-09-22 15:15:52 -04:00
binlog_stm_insert_select.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_stm_mix_innodb_myisam.result Bug#43746: YACC return wrong query string when parse 'load data infile' sql statement 2009-09-28 05:41:10 -07:00
binlog_stm_ps.result Post fix of result file after push of BUG#42415 2009-05-20 18:28:43 +08:00
binlog_stm_row.result Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam 2009-05-31 13:44:41 +08:00
binlog_stm_unsafe_warning.result Bug#46265: Can not disable warning about unsafe statements for binary logging 2009-07-31 10:00:35 -03:00
binlog_tbl_metadata.result BUG#42749: infinite loop writing to row based binlog - processlist shows 2009-05-12 12:53:46 +01:00
binlog_tmp_table.result Backport fixes for the follow tests 2009-10-02 17:24:21 +08: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 WL#2110 (SIGNAL) 2009-09-10 03:18:29 -06:00