diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-09 11:46:58 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-09 11:46:58 +0500 |
| commit | 37feda2596128fec33ac0e4fe8ff0cd35efd1dec (patch) | |
| tree | 9f49733e328a5be3338fddb8a75cab6800d84591 /mysql-test/r/loaddata.result | |
| parent | 7f993fa6789d92b7927e76ba00d356a6409e4ce0 (diff) | |
| parent | d2667d1a6ebe7feeb8b80fcc5cfefac80ed729b0 (diff) | |
| download | mariadb-git-37feda2596128fec33ac0e4fe8ff0cd35efd1dec.tar.gz | |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/t/loaddata.test:
Auto merged
sql/sql_load.cc:
Auto merged
mysql-test/r/loaddata.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index eb3418f1f18..bb222db74da 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -165,6 +165,15 @@ select load_file("MYSQL_TEST_DIR/t/loaddata.test"); load_file("MYSQL_TEST_DIR/t/loaddata.test") NULL drop table t1, t2; +create table t1(f1 int); +insert into t1 values(1),(null); +create table t2(f2 int auto_increment primary key); +select * from t2; +f2 +1 +2 +SET @@SQL_MODE=@OLD_SQL_MODE; +drop table t1,t2; CREATE TABLE t1 (a int); INSERT INTO t1 VALUES (1); SET NAMES latin1; |