summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <tim@cane.mysql.fi>2000-12-18 23:22:20 +0200
committerunknown <tim@cane.mysql.fi>2000-12-18 23:22:20 +0200
commit22f0ffed87c94ff5983ed8874cdcf1b4a5113c83 (patch)
tree6c7a3e5744b99f5ca62385fc84624366492f5c0b /sql/sql_parse.cc
parenta765e56fa17f03e000c86d876dd3c0c1cf33f498 (diff)
downloadmariadb-git-22f0ffed87c94ff5983ed8874cdcf1b4a5113c83.tar.gz
Added SHOW OPEN TABLES. Thanks to Antony T Curtis <antony@abacus.co.uk>
for the code. Docs/manual.texi: - added SHOW OPEN TABLES sql/gen_lex_hash.cc: - added SHOW OPEN TABLES sql/lex.h: - added SHOW OPEN TABLES sql/mysql_priv.h: - added SHOW OPEN TABLES sql/sql_base.cc: - added SHOW OPEN TABLES sql/sql_lex.h: - added SHOW OPEN TABLES sql/sql_parse.cc: - added SHOW OPEN TABLES sql/sql_show.cc: - added SHOW OPEN TABLES sql/sql_yacc.yy: - added SHOW OPEN TABLES
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index fef35ed88d0..30b45cb18df 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1488,6 +1488,8 @@ mysql_execute_command(void)
}
#endif
case SQLCOM_SHOW_TABLES:
+ /* FALL THROUGH */
+ case SQLCOM_SHOW_OPEN_TABLES:
#ifdef DONT_ALLOW_SHOW_COMMANDS
send_error(&thd->net,ER_NOT_ALLOWED_COMMAND); /* purecov: inspected */
DBUG_VOID_RETURN;
@@ -1508,8 +1510,11 @@ mysql_execute_command(void)
if (check_access(thd,SELECT_ACL,db,&thd->col_access))
goto error; /* purecov: inspected */
/* grant is checked in mysqld_show_tables */
- if (lex->options & SELECT_DESCRIBE)
- res= mysqld_extend_show_tables(thd,db,
+ if (lex->sql_command == SQLCOM_SHOW_OPEN_TABLES)
+ res= mysqld_show_open_tables(thd,db,
+ (lex->wild ? lex->wild->ptr() : NullS));
+ else if (lex->options & SELECT_DESCRIBE)
+ res= mysqld_extend_show_tables(thd,db,
(lex->wild ? lex->wild->ptr() : NullS));
else
res= mysqld_show_tables(thd,db,