diff options
| author | unknown <monty@mishka.local> | 2005-04-16 03:40:33 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-04-16 03:40:33 +0300 |
| commit | 0327d05c69a14f3e81a142770002f261fb988f0f (patch) | |
| tree | 714924d022310bb308f6947ce5fd9f7d95b131f8 /sql/set_var.cc | |
| parent | bd4c929ba6f02ca816f399e1be478a22bd492f43 (diff) | |
| download | mariadb-git-0327d05c69a14f3e81a142770002f261fb988f0f.tar.gz | |
Fixed core dump with long timezone names
Don't abort on bootstrap if a wrong --default-storage-engine is specified
sql/handler.cc:
Combined code
sql/mysqld.cc:
Fixed core dump with long timezone names
Don't abort on bootstrap if a wrong --default-storage-engine is specified
Don't print strange messages if one sends 'kill' to a mysqld --bootstrap
sql/set_var.cc:
Indentaion change
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 9cf3dcac047..9f63188c28a 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2985,8 +2985,8 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var) enum db_type db_type; if (!(res=var->value->val_str(&str)) || !(var->save_result.ulong_value= - (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) || - ha_checktype(db_type) != db_type) + (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) || + ha_checktype(db_type) != db_type) { value= res ? res->c_ptr() : "NULL"; goto err; |