diff options
| author | monty@donna.mysql.fi <> | 2001-04-25 22:44:57 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-04-25 22:44:57 +0300 |
| commit | f01a7fceb2537cf2c9f545a5270e6d11394ada5d (patch) | |
| tree | 423d50939ffecb0332aa31928804fc8a06a5dd45 /mysql-test/r | |
| parent | 7fb48d910011a0324cbe9f77fc238b073df794ae (diff) | |
| parent | 21e7c668ff8bea797ede22c3ce03f6f186685c35 (diff) | |
| download | mariadb-git-f01a7fceb2537cf2c9f545a5270e6d11394ada5d.tar.gz | |
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/show_check.result | 13 | ||||
| -rw-r--r-- | mysql-test/r/shw000001.result | 5 |
2 files changed, 13 insertions, 5 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result index 8c50570a31d..ce2e5d4f58d 100644 --- a/mysql-test/r/show_check.result +++ b/mysql-test/r/show_check.result @@ -67,3 +67,16 @@ t1 0 PRIMARY 1 f1 A 1 NULL NULL t1 0 PRIMARY 2 f2 A 3 NULL NULL t1 0 PRIMARY 3 f3 A 9 NULL NULL t1 0 PRIMARY 4 f4 A 18 NULL NULL +Table Create Table +t1 CREATE TEMPORARY TABLE `t1` ( + `a` int(11) NOT NULL default '0' +) TYPE=MyISAM +Table Create Table +t2 CREATE TEMPORARY TABLE `t2` ( + `a` int(11) NOT NULL default '0' +) TYPE=MyISAM +Table Create Table +t1 CREATE TABLE `t1` ( + `test_set` set('val1','val2','val3') NOT NULL default '', + `name` char(20) default 'O''Brien' +) TYPE=MyISAM COMMENT='it''s a table' diff --git a/mysql-test/r/shw000001.result b/mysql-test/r/shw000001.result deleted file mode 100644 index c8056c74f0b..00000000000 --- a/mysql-test/r/shw000001.result +++ /dev/null @@ -1,5 +0,0 @@ -Table Create Table -t1 CREATE TABLE `t1` ( - `test_set` set('val1','val2','val3') NOT NULL default '', - `name` char(20) default 'O''Brien' -) TYPE=MyISAM COMMENT='it''s a table' |