mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/mysql-test/extra/binlog_tests
History
unknown a69a96e26a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


client/mysqltest.c:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_wincond.c:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
client/mysql_upgrade.c:
  Manual merge; I chose to keep Magnus' changes because they make the code
  more simple; always use *only* the option file created by mysql_upgrade.
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Manual merge
mysql-test/r/binlog_row_ctype_cp932.result:
  Manual merge
mysql-test/r/binlog_stm_ctype_cp932.result:
  Manual merge
mysql-test/r/mysqlbinlog.result:
  Manual merge
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Manual merge
mysql-test/t/mysqlbinlog.test:
  Manual merge
mysql-test/t/rpl_switch_stm_row_mixed.test:
  Manual merge
2007-03-07 07:21:24 +01:00
..
binlog.test BUG#25091 (A DELETE statement to mysql database is not logged in ROW format): 2007-02-26 10:19:08 +01:00
binlog_insert_delayed.test One more fix for binlog_row_binlog due to interminism of checking with 2006-09-27 13:05:29 +03:00
blackhole.test Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-02-26 15:54:43 +04:00
ctype_cp932.test Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-03-07 07:21:24 +01:00
ctype_cp932_binlog.test WL#3023 (RBR: Use locks in a statement-like manner): 2006-02-24 16:19:55 +01:00
ctype_ucs_binlog.test After merge fix. 2006-12-29 16:00:51 +04:00
drop_temp_table.test WL#3023 (RBR: Use locks in a statement-like manner): 2006-02-24 16:19:55 +01:00
innodb_stat.test bug #19650 (Embedded crashes in 5.1.10) 2006-05-24 13:28:24 +05:00
insert_select-binlog.test Give warnings for unused objects 2007-01-22 18:42:52 +02:00
mix_innodb_myisam_binlog.test Give warnings for unused objects 2007-01-22 18:42:52 +02:00