diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-30 15:20:40 +0300 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-12-30 15:20:40 +0300 |
| commit | 525242d37f2f422c9ace66a3697768fcb3c95f1c (patch) | |
| tree | a29cacdddcfc6730cc111f27a803ab1b341267be /sql/sql_parse.cc | |
| parent | 499deb9c442d621a1613713a05c624abcc4f24b1 (diff) | |
| download | mariadb-git-525242d37f2f422c9ace66a3697768fcb3c95f1c.tar.gz | |
wl#1629 SHOW with WHERE(final part, after review)
added syntax:
'show variables where', 'show status where', 'show open tables where'
mysql-test/r/grant_cache.result:
wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/information_schema.result:
wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/query_cache.result:
wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/temp_table.result:
wl#1629 SHOW with WHERE(final part,after review)
mysql-test/r/union.result:
wl#1629 SHOW with WHERE(final part,after review)
mysql-test/t/information_schema.test:
wl#1629 SHOW with WHERE(final part,after review)
mysql-test/t/query_cache.test:
wl#1629 SHOW with WHERE(final part,after review)
sql/item.cc:
wl#1629 SHOW with WHERE(final part,after review)
sql/mysql_priv.h:
wl#1629 SHOW with WHERE(final part,after review)
sql/sql_parse.cc:
wl#1629 SHOW with WHERE(final part,after review)
sql/sql_select.cc:
wl#1629 SHOW with WHERE(final part,after review)
sql/sql_show.cc:
wl#1629 SHOW with WHERE(final part,after review)
sql/sql_yacc.yy:
wl#1629 SHOW with WHERE(final part,after review)
sql/table.h:
wl#1629 SHOW with WHERE(final part,after review)
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 4a357c6eefe..277fe676368 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1964,6 +1964,9 @@ int prepare_schema_table(THD *thd, LEX *lex, Table_ident *table_ident, break; } #endif + case SCH_OPEN_TABLES: + case SCH_VARIABLES: + case SCH_STATUS: case SCH_PROCEDURES: case SCH_CHARSETS: case SCH_COLLATIONS: @@ -3121,25 +3124,6 @@ create_error: case SQLCOM_SHOW_COLUMN_TYPES: res= mysqld_show_column_types(thd); break; - case SQLCOM_SHOW_STATUS: - STATUS_VAR tmp; - if (lex->option_type == OPT_GLOBAL) - { - pthread_mutex_lock(&LOCK_status); - calc_sum_of_all_status(&tmp); - } - res= mysqld_show(thd, (lex->wild ? lex->wild->ptr() : NullS), - status_vars, OPT_GLOBAL, &LOCK_status, - (lex->option_type == OPT_GLOBAL ? - &tmp: &thd->status_var)); - if (lex->option_type == OPT_GLOBAL) - pthread_mutex_unlock(&LOCK_status); - break; - case SQLCOM_SHOW_VARIABLES: - res= mysqld_show(thd, (lex->wild ? lex->wild->ptr() : NullS), - init_vars, lex->option_type, - &LOCK_global_system_variables, 0); - break; case SQLCOM_SHOW_LOGS: #ifdef DONT_ALLOW_SHOW_COMMANDS my_message(ER_NOT_ALLOWED_COMMAND, ER(ER_NOT_ALLOWED_COMMAND), @@ -3153,9 +3137,6 @@ create_error: break; } #endif - case SQLCOM_SHOW_OPEN_TABLES: - res= mysqld_show_open_tables(thd,(lex->wild ? lex->wild->ptr() : NullS)); - break; case SQLCOM_CHANGE_DB: mysql_change_db(thd,select_lex->db); break; |