From 0327d05c69a14f3e81a142770002f261fb988f0f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 16 Apr 2005 03:40:33 +0300 Subject: 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 --- sql/set_var.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/set_var.cc') 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; -- cgit v1.2.1