diff options
| author | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-12 12:31:44 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145j.mysql.com> | 2007-01-12 12:31:44 +0100 |
| commit | bb484726010c9e448ed2ee9e9731150b22c15d8f (patch) | |
| tree | 8f05ed2f7b6984f4ca7df8e1eafad42a9d4235e2 /mysql-test/include | |
| parent | 84e8991666227a538f38d99548ab27f21a38fbf2 (diff) | |
| parent | ff9c35006fd887fba6ad921e5ec4f7bdbb364248 (diff) | |
| download | mariadb-git-bb484726010c9e448ed2ee9e9731150b22c15d8f.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/CMakeLists.txt:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysys/my_thr_init.c:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/rpl_injector.cc:
Auto merged
sql/rpl_injector.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_locale.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
unittest/mysys/my_atomic-t.c:
Auto merged
sql/log_event.cc:
Manual merge main->rpl
sql/mysqld.cc:
Manual merge main->rpl
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_row_based.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/not_row_based.inc | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/include/have_row_based.inc b/mysql-test/include/have_row_based.inc deleted file mode 100644 index 23771fde5cc..00000000000 --- a/mysql-test/include/have_row_based.inc +++ /dev/null @@ -1,4 +0,0 @@ --- require r/have_row_based.require -disable_query_log; -show variables like "have_row_based_replication"; -enable_query_log; diff --git a/mysql-test/include/not_row_based.inc b/mysql-test/include/not_row_based.inc deleted file mode 100644 index 22f40bdceb0..00000000000 --- a/mysql-test/include/not_row_based.inc +++ /dev/null @@ -1,4 +0,0 @@ --- require r/not_row_based.require -disable_query_log; -show variables like "have_row_based_replication"; -enable_query_log; |