summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2005-09-23 09:18:56 +0200
committermsvensson@neptunus.(none) <>2005-09-23 09:18:56 +0200
commit02c7645cc10671954195c3d45271c819643dbddd (patch)
treec8bd72147c7a879a6bd64b822d50e5b84a315c56 /mysql-test/r/loaddata.result
parentf5c00b0dbda74c899067880ac0de5c489d54b19f (diff)
parent4700631aa86ef453c6d053e7458e2306193cd920 (diff)
downloadmariadb-git-02c7645cc10671954195c3d45271c819643dbddd.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r--mysql-test/r/loaddata.result10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result
index d76fff372f5..e2cd89a58dc 100644
--- a/mysql-test/r/loaddata.result
+++ b/mysql-test/r/loaddata.result
@@ -66,6 +66,16 @@ a b
3 row 3
0
drop table t1;
+SET @OLD_SQL_MODE=@@SQL_MODE, @@SQL_MODE=NO_AUTO_VALUE_ON_ZERO;
+create table t1(id integer not null auto_increment primary key);
+insert into t1 values(0);
+select * from t1;
+id
+0
+select * from t1;
+id
+0
+SET @@SQL_MODE=@OLD_SQL_MODE;
create table t1 (a int default 100, b int, c varchar(60));
load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
select * from t1;