diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-08-17 14:10:15 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-08-17 14:10:15 +0300 |
| commit | 0eaf4d8d7e879b32d5e1e0c7ecb409bc4d4cb060 (patch) | |
| tree | 87feb8f1e2709918215eaa5b5031a4a243ba4531 /sql/sql_parse.cc | |
| parent | 9ac61d15faf874589bd01ae9fa8d1854f6dc6621 (diff) | |
| download | mariadb-git-0eaf4d8d7e879b32d5e1e0c7ecb409bc4d4cb060.tar.gz | |
Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
Changed some non fatal myisamchk error messages to warnings
myisam/myisamchk.c:
Change error -> warning
sql/handler.cc:
Add mutex around keybuff_size usage
sql/mysql_priv.h:
Indentation update
sql/set_var.cc:
Add mutex around longlong variable usage
sql/sql_parse.cc:
Fix mutex handling in SHOW_VARIABLES
sql/sql_show.cc:
Fix mutex handling in SHOW_VARIABLES
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 70c0f772d7d..780c97654f5 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2146,11 +2146,12 @@ mysql_execute_command(void) break; case SQLCOM_SHOW_STATUS: res= mysqld_show(thd,(lex->wild ? lex->wild->ptr() : NullS),status_vars, - OPT_GLOBAL); + OPT_GLOBAL, &LOCK_status); break; case SQLCOM_SHOW_VARIABLES: res= mysqld_show(thd, (lex->wild ? lex->wild->ptr() : NullS), - init_vars, lex->option_type); + init_vars, lex->option_type, + &LOCK_global_system_variables); break; case SQLCOM_SHOW_LOGS: { |