diff options
author | unknown <monty@mashka.mysql.fi> | 2003-05-22 11:58:39 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-05-22 11:58:39 +0300 |
commit | 12c777502871eef7528a9d48bbcc3282879f4779 (patch) | |
tree | 7b21568da00675e436f09d929150a615cfa76038 /mysql-test/r/loaddata.result | |
parent | c23102ab5089fdf3a4f067a85bad53c8644bc4e9 (diff) | |
download | mariadb-git-12c777502871eef7528a9d48bbcc3282879f4779.tar.gz |
Updated results & after merge fix
BitKeeper/etc/ignore:
added include/readline/*.h
mysql-test/r/create.result:
Update results
mysql-test/r/loaddata.result:
Updated results
sql/mysqld.cc:
Fix after merge
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r-- | mysql-test/r/loaddata.result | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index d121a4e6c40..7b4802136f3 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -1,6 +1,13 @@ drop table if exists t1; create table t1 (a date, b date, c date not null, d date); load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ','; +Warnings: +Warning 1263 Data truncated for column 'a' at row 1 +Warning 1263 Data truncated for column 'c' at row 1 +Warning 1263 Data truncated for column 'd' at row 1 +Warning 1263 Data truncated for column 'a' at row 2 +Warning 1263 Data truncated for column 'b' at row 2 +Warning 1263 Data truncated for column 'd' at row 2 load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES; SELECT * from t1; a b c d |