1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Manual merge 5.1-rep+2 to 5.1-rep+3

This commit is contained in:
He Zhenxing
2009-10-18 11:57:38 +08:00
372 changed files with 15369 additions and 2607 deletions

View File

@@ -13,6 +13,10 @@
-- source include/not_ndb_default.inc
-- source include/master-slave.inc
disable_query_log;
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
enable_query_log;
create table t1 (a int not null auto_increment primary key, b int, key(b));
INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
INSERT INTO t1 (a) SELECT null FROM t1;