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 | a2867c7ae93f760106ffc45086efa372cbf884dd (patch) | |
| tree | 7b21568da00675e436f09d929150a615cfa76038 /mysql-test | |
| parent | 99740ff53d21e4ae50764d0170a08562222d2150 (diff) | |
| download | mariadb-git-a2867c7ae93f760106ffc45086efa372cbf884dd.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')
| -rw-r--r-- | mysql-test/r/create.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/loaddata.result | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index b39bb96e36a..7a4ba1703a4 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -193,7 +193,7 @@ SELECT @@table_type; GEMINI CREATE TABLE t1 (a int not null); Warnings: -Warning 1259 Using storage engine MYISAM for table 't1' +Warning 1264 Using storage engine MYISAM for table 't1' show create table t1; Table Create Table t1 CREATE TABLE `t1` ( 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 |