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 /myisam | |
| 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 'myisam')
| -rw-r--r-- | myisam/myisamchk.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 4fadfd2fc5d..a0b4515f1dd 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -1400,21 +1400,22 @@ static int mi_sort_records(MI_CHECK *param, if (!(((ulonglong) 1 << sort_key) & share->state.key_map)) { - mi_check_print_error(param,"Can't sort table '%s' on key %d; No such key", + mi_check_print_warning(param, + "Can't sort table '%s' on key %d; No such key", name,sort_key+1); param->error_printed=0; DBUG_RETURN(0); /* Nothing to do */ } if (keyinfo->flag & HA_FULLTEXT) { - mi_check_print_error(param,"Can't sort table '%s' on FULLTEXT key %d", - name,sort_key+1); + mi_check_print_warning(param,"Can't sort table '%s' on FULLTEXT key %d", + name,sort_key+1); param->error_printed=0; DBUG_RETURN(0); /* Nothing to do */ } if (share->data_file_type == COMPRESSED_RECORD) { - mi_check_print_error(param,"Can't sort read-only table '%s'", name); + mi_check_print_warning(param,"Can't sort read-only table '%s'", name); param->error_printed=0; DBUG_RETURN(0); /* Nothing to do */ } |