summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-07-07 19:15:41 -0600
committerunknown <sasha@mysql.sashanet.com>2001-07-07 19:15:41 -0600
commit24638d06bd497d0ee756ca68bb045d3bbb3e75ba (patch)
tree22e94a9a53c70287a33e1657ee4bd4371ec04fb8 /mysql-test
parent8aac0529c78052e90b6cf2fed36cc9d107796654 (diff)
downloadmariadb-git-24638d06bd497d0ee756ca68bb045d3bbb3e75ba.tar.gz
post-merge fixes
test SHOW OPEN TABLES mysql-test/r/show_check.result: updated result mysql-test/t/show_check.test: test show open tables sql/mysql_priv.h: post-merge fixes sql/sql_base.cc: post-merge fixes sql/sql_parse.cc: post-merge fixes
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/show_check.result3
-rw-r--r--mysql-test/t/show_check.test7
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index 099ea2fa109..4d3b1b66e95 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -90,3 +90,6 @@ t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL default '0',
PRIMARY KEY (`a`)
) TYPE=MyISAM
+Open_tables_in_test Comment
+Open_tables_in_test Comment
+t1 cached=1, in_use=0
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 476d8dcdf0d..95b5a0fb0f1 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -72,3 +72,10 @@ drop table t1;
create table t1 (a int not null, primary key (a));
show create table t1;
drop table t1;
+
+flush tables;
+show open tables;
+create table t1(n int);
+insert into t1 values (1);
+show open tables;
+drop table t1;