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 | |
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')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
-rw-r--r-- | mysql-test/r/show_check.result | 13 | ||||
-rw-r--r-- | mysql-test/r/shw000001.result | 5 | ||||
-rw-r--r-- | mysql-test/t/show_check.test | 17 | ||||
-rw-r--r-- | mysql-test/t/shw000001.test | 8 |
5 files changed, 32 insertions, 13 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 008889ff521..ece2e42f40b 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -369,6 +369,8 @@ mysql_install_db () { error "Could not install slave test DBs" exit 1 fi + # Give mysqld some time to die. + sleep $SLEEP_TIME return 0 } 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' diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test index d4be1a6d25a..f4f58c8c885 100644 --- a/mysql-test/t/show_check.test +++ b/mysql-test/t/show_check.test @@ -48,3 +48,20 @@ show index from t1; repair table t1; show index from t1; drop table t1; + +# +# Test of SHOW CREATE +# + +create temporary table t1 (a int not null); +show create table t1; +alter table t1 rename t2; +show create table t2; +drop table t2; + +create table t1 ( + test_set set( 'val1', 'val2', 'val3' ) not null default '', + name char(20) default 'O''Brien' + ) comment = 'it\'s a table' ; +show create table t1 ; +drop table t1; diff --git a/mysql-test/t/shw000001.test b/mysql-test/t/shw000001.test deleted file mode 100644 index 6b24d8a44c7..00000000000 --- a/mysql-test/t/shw000001.test +++ /dev/null @@ -1,8 +0,0 @@ -use test; -drop table if exists t1; -create table t1 ( - test_set set( 'val1', 'val2', 'val3' ) not null default '', - name char(20) default 'O''Brien' - ) comment = 'it\'s a table' ; -show create table t1 ; -drop table t1; |