1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Auto merge.

This commit is contained in:
2010-01-12 20:13:45 +08:00
2 changed files with 2 additions and 0 deletions

View File

@@ -1,3 +1,4 @@
RESET MASTER;
CREATE TABLE t1 (c1 char(50));
LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
LOAD DATA CONCURRENT INFILE '../../std_data/words.dat' INTO TABLE t1;

View File

@@ -1,6 +1,7 @@
-- source include/not_ndb_default.inc
-- source include/have_log_bin.inc
-- source include/have_binlog_format_statement.inc
RESET MASTER;
let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
CREATE TABLE t1 (c1 char(50));