diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-17 19:04:33 +0200 |
| commit | 456102115c2f70982e600e40e34a10afde72c703 (patch) | |
| tree | a90993e8e601e10bc825a635e85bda9a1d5ee5bd /mysql-test/r/merge.result | |
| parent | d83e79ce76d77cfdf2b5589e053df988b90f17d7 (diff) | |
| download | mariadb-git-456102115c2f70982e600e40e34a10afde72c703.tar.gz | |
Write UNION() for MERGE tables
Docs/manual.texi:
Clearify when logging is done
myisam/myisamchk.c:
Better error message
mysql-test/r/merge.result:
Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
Search by default in database directory
sql/ha_myisammrg.h:
Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
removed compiler warning
Diffstat (limited to 'mysql-test/r/merge.result')
| -rw-r--r-- | mysql-test/r/merge.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result index aa9ea098e0a..e741a309c9f 100644 --- a/mysql-test/r/merge.result +++ b/mysql-test/r/merge.result @@ -81,6 +81,12 @@ a 412 412 411 +Table Create Table +t3 CREATE TABLE `t3` ( + `a` int(11) NOT NULL default '0', + `b` char(20) default NULL, + KEY `a` (`a`) +) TYPE=MRG_MyISAM UNION=(t1,t2) c test1 test1 |