summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog/r
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-08-18 13:29:04 +0200
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-08-18 13:29:04 +0200
commit5139bf6c8f2cde4b598aa0e822f126936346f914 (patch)
treeb38d061771d52ab55fe9d428e45627d4c08d5f63 /mysql-test/suite/binlog/r
parentbd75361929caadac565d471d7e374060ff93794d (diff)
parent8977575cff0ed295692e866b1cd543bdf49c0a20 (diff)
downloadmariadb-git-5139bf6c8f2cde4b598aa0e822f126936346f914.tar.gz
Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.
Diffstat (limited to 'mysql-test/suite/binlog/r')
-rw-r--r--mysql-test/suite/binlog/r/binlog_mixed_load_data.result10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_mixed_load_data.result b/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
new file mode 100644
index 00000000000..840257f11ff
--- /dev/null
+++ b/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
@@ -0,0 +1,10 @@
+RESET MASTER;
+CREATE TABLE t1 (word CHAR(20) NOT NULL) ENGINE=MYISAM;
+LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;
+show binlog events from <binlog_start>;
+Log_name Pos Event_type Server_id End_log_pos Info
+master-bin.000001 # Query # # BEGIN
+master-bin.000001 # Table_map # # table_id: # (test.t1)
+master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
+master-bin.000001 # Query # # COMMIT
+DROP TABLE t1;