summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-09-11 19:06:23 +0300
committermonty@mashka.mysql.fi <>2003-09-11 19:06:23 +0300
commit45aa92c574e032bcf85b7207732158433e64afd5 (patch)
treeba442d57a65bd55a0d0fec02aa6abeae237a568b /mysql-test/r/loaddata.result
parent80565e13527206b0e8fac4a1f01cea96dd23423a (diff)
downloadmariadb-git-45aa92c574e032bcf85b7207732158433e64afd5.tar.gz
After merge fixes.
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r--mysql-test/r/loaddata.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index 7d21ede0345..d738431e016 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -30,6 +30,8 @@ NULL 2003-03-03 2003-03-03 NULL
drop table t1;
create table t1 (a text, b text);
load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+Warnings:
+Warning 1260 Record count is fewer than the column count at row 3
select concat('|',a,'|'), concat('|',b,'|') from t1;
concat('|',a,'|') concat('|',b,'|')
|Field A| |Field B|