diff options
| author | monty@mysql.com <> | 2003-12-19 16:34:48 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2003-12-19 16:34:48 +0200 |
| commit | eeff10e4c17c3342f5ee8cbbe70203dfbd984678 (patch) | |
| tree | 05b144ca850fc0bb99c1922907bfb2e9ba19fc77 /sql/set_var.cc | |
| parent | c10b25968e34401b91a0031177e01fdba46e2ecc (diff) | |
| parent | 031390a9a4904924c21929314dcd42886c84c175 (diff) | |
| download | mariadb-git-eeff10e4c17c3342f5ee8cbbe70203dfbd984678.tar.gz | |
merge
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 f9d5377b890..c8b11eb0f58 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -791,9 +791,8 @@ bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex, /* If the string is "", delete old init command */ if (var && (new_length= var->value->str_value.length())) { - if (!(res= my_strdup_with_length(var->value->str_value.ptr(), - new_length, - MYF(0)))) + if (!(res= my_strdup_with_length((byte*) var->value->str_value.ptr(), + new_length, MYF(0)))) return 1; } /* @@ -2505,6 +2504,7 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var) } return 0; } + value= "unknown"; err: my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), value); |