mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/suite/binlog/r
History
unknown bf9eb0f0d7 manual merge for bug_29136, bug#29309. 
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
  manual merge from 5.0
mysql-test/r/innodb.result:
  results changed
mysql-test/r/multi_update.result:
  results changed
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
  manual merge: results re-recorded
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  results changed
mysql-test/suite/manual/r/rpl_replication_delay.result:
  results recorded for 5.1
mysql-test/t/innodb.test:
  removing bug27716 regression test as one exists in binlog suite already.
mysql-test/t/multi_update.test:
  manual merge plus refining for execution in both binlog_format.
sql/log_event.cc:
  bloody manual merge;
  the fact that an event is artificial is encode with setting timestamp argument to zero.
  rli's last_master_timestamp won't be updated in stmt_done in such case.
sql/rpl_rli.cc:
  simulation and the real fixing code.
  Don't update last_master_timestamp with zero.
sql/sql_delete.cc:
  manual merge
2007-10-13 23:12:50 +03:00
..
binlog_innodb.result Updates to allow innodb.test to be run with --embedded-server, 2007-08-14 15:35:19 -06:00
binlog_killed.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_multi_engine.result Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-main 2007-07-25 15:40:43 +02:00
binlog_row_binlog.result WL#3228 (RBR using different table defs on slave/master): 2007-07-30 13:32:15 +02:00
binlog_row_ctype_cp932.result Merge olga.mysql.com:/home/igor/mysql-5.1-rpl 2007-07-13 23:54:41 -07:00
binlog_row_ctype_ucs.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_row_drop_tmp_tbl.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_row_innodb_stat.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_row_insert_select.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_row_mix_innodb_myisam.result manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
binlog_statement_insert_delayed.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_stm_binlog.result Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 2007-07-10 18:31:50 +02:00
binlog_stm_blackhole.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_stm_ctype_cp932.result Merge olga.mysql.com:/home/igor/mysql-5.1-rpl 2007-07-13 23:54:41 -07:00
binlog_stm_ctype_ucs.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_stm_drop_tmp_tbl.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00
binlog_stm_innodb_stat.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02: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 manual merge for bug_29136, bug#29309. 2007-10-13 23:12:50 +03:00
binlog_stm_ps.result WL#3933 Split main test suite to rpl, rpl_ndb and ndb 2007-06-27 14:28:02 +02:00