diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-04-08 12:52:53 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-04-08 12:52:53 +0300 |
| commit | db1d83a5cca4c1b9d96b8580ae2bde80a31f1ad8 (patch) | |
| tree | f227c794a048f6e49813e5564f749f4467d6333f /sql/set_var.cc | |
| parent | a91e89dec672cd954d20fbe729006f2845bd32ed (diff) | |
| parent | 04ff96f7891cf4a714a3f60a4ec15b5ead7a3f31 (diff) | |
| download | mariadb-git-db1d83a5cca4c1b9d96b8580ae2bde80a31f1ad8.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 29c09554b2e..8a512b8947b 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2604,7 +2604,7 @@ static int sys_check_log_path(THD *thd, set_var *var) char path[FN_REFLEN], buff[FN_REFLEN]; MY_STAT f_stat; String str(buff, sizeof(buff), system_charset_info), *res; - const char *log_file_str; + const char *log_file_str= 0; size_t path_length; if (!(res= var->value->val_str(&str))) @@ -2654,7 +2654,7 @@ static int sys_check_log_path(THD *thd, set_var *var) err: my_error(ER_WRONG_VALUE_FOR_VAR, MYF(0), var->var->name, - res ? log_file_str : "NULL"); + log_file_str ? log_file_str : "NULL"); return 1; } @@ -2663,7 +2663,7 @@ bool update_sys_var_str_path(THD *thd, sys_var_str *var_str, set_var *var, const char *log_ext, bool log_state, uint log_type) { - MYSQL_QUERY_LOG *file_log; + MYSQL_QUERY_LOG *file_log= 0; char buff[FN_REFLEN]; char *res= 0, *old_value=(char *)(var ? var->value->str_value.ptr() : 0); bool result= 0; |