diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-23 14:37:22 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-23 14:37:22 +0200 |
| commit | 72a8049b0dda6e06d893f3be64a2aced4c94eed4 (patch) | |
| tree | 2eaeadd57a23c5370c6f6a873954cbf3dd210ccf /mysql-test/r/loaddata.result | |
| parent | 129300f13dbc77d77c0f25aebcf70e209041c609 (diff) | |
| download | mariadb-git-72a8049b0dda6e06d893f3be64a2aced4c94eed4.tar.gz | |
Merge from 4.1 to 5.0
mysql-test/r/loaddata.result:
Add drop tablea after test case
mysql-test/r/type_decimal.result:
Update warnings
mysql-test/r/union.result:
Miss in merge
mysql-test/t/loaddata.test:
Add drop table after test case
sql/opt_sum.cc:
Add missing }
sql/sql_load.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index e2cd89a58dc..f9d47e3533c 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -76,6 +76,7 @@ select * from t1; id 0 SET @@SQL_MODE=@OLD_SQL_MODE; +drop table t1; 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; |