diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-29 11:32:09 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-29 11:32:09 +0200 |
| commit | 5f3b1496c5b42b85e2040f307cb86e5f812b47e4 (patch) | |
| tree | 347dcd807da3d2462141ec4e2106e575667166b2 /mysql-test/r/csv.result | |
| parent | 0442ee641402c28d029f9350467f7c7923bf5d5f (diff) | |
| parent | ebb481996c2cd7a82221ddc41d60a4ddff41582b (diff) | |
| download | mariadb-git-5f3b1496c5b42b85e2040f307cb86e5f812b47e4.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands
into shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
client/Makefile.am:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/sp_notembedded.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
Diffstat (limited to 'mysql-test/r/csv.result')
| -rw-r--r-- | mysql-test/r/csv.result | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mysql-test/r/csv.result b/mysql-test/r/csv.result index e342af32a80..bf3fc732043 100644 --- a/mysql-test/r/csv.result +++ b/mysql-test/r/csv.result @@ -4913,8 +4913,7 @@ bonfire Colombo nondecreasing DROP TABLE t1; -ALTER TABLE t2 RENAME t1 -#; +ALTER TABLE t2 RENAME t1; DROP TABLE t1; CREATE TABLE t1 ( Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL, |