diff options
| author | unknown <guilhem@mysql.com> | 2004-03-18 19:31:06 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-03-18 19:31:06 +0200 |
| commit | a068b4a75506a23cc2381394745066e2891e288d (patch) | |
| tree | f6d687cac6d9b8083a09bc30eff261588dac84e4 /mysql-test/r/mysqlbinlog.result | |
| parent | bffc3339c5dd71fa810ef44c78d3577a7908c6f2 (diff) | |
| parent | 83e696e61cf55da401d985cc6e14b759f7391820 (diff) | |
| download | mariadb-git-a068b4a75506a23cc2381394745066e2891e288d.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
client/mysqlbinlog.cc:
Auto merged
mysql-test/r/mysqlbinlog.result:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -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*/; |