database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands

Browse Source 
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
This commit is contained in:
unknown
2006-09-29 11:32:09 +02:00
parent 60928825f5 5960176833
commit ea4c934a40
14 changed files with 692 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/csv.result
View File

@ -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,