diff options
| author | guilhem@mysql.com <> | 2004-03-18 19:31:06 +0200 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2004-03-18 19:31:06 +0200 |
| commit | 32feac3093354ef3e3f89b3ade549d079ba8e9a7 (patch) | |
| tree | f6d687cac6d9b8083a09bc30eff261588dac84e4 /mysql-test/r | |
| parent | 1e0ccbd9b07f62051f8f5910c500932f0caae147 (diff) | |
| parent | 244304fdbb8f5f2bb33fcd0fa9b22e43634c6668 (diff) | |
| download | mariadb-git-32feac3093354ef3e3f89b3ade549d079ba8e9a7.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 72eb4c37d34..5592524cc39 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -64,9 +64,6 @@ LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-1' INTO TABLE `t1` FI LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); -LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-6-1' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); -SET TIMESTAMP=1000000000; -insert into t1 values ("Alas"); --- Broken LOAD DATA -- /*!40019 SET @@session.max_insert_delayed_threads=0*/; |