database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity

Manual merge from next-mr.

Browse Source
This commit is contained in:
2010-01-12 20:07:09 +08:00
parent d866afe56f e698ae0112
commit b805e3d4d6
813 changed files with 20643 additions and 16672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
View File

@@ -34,5 +34,6 @@ CREATE TABLE mysql.ndb_apply_status
--source extra/rpl_tests/rpl_ndb_2multi_eng.test
set @@global.slave_exec_mode= DEFAULT;
--connection slave
drop table mysql.ndb_apply_status;

1
mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
View File

@@ -33,5 +33,6 @@ CREATE TABLE mysql.ndb_apply_status
--source extra/rpl_tests/rpl_ndb_2multi_eng.test
set @@global.slave_exec_mode= DEFAULT;
--connection slave
drop table mysql.ndb_apply_status;

2
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-master.opt
View File

@@ -1 +1 @@
--new=true
--new

2
mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_partitions-slave.opt
View File

@@ -1 +1 @@
--new=true
--new