Commit b6aff81b authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
parents 4d5ef21f f92ec090

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ paul@frost.snake.net 
paul@ice.local

paul@ice.snake.net

paul@kite-hub.kitebird.com

paul@snake-hub.snake.net

paul@teton.kitebird.com

pekka@mysql.com

pem@mysql.com

sql/set_var.cc

+1 −1
Original line number Diff line number Diff line
@@ -2948,7 +2948,7 @@ 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())) ||

	 (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) ||

	ha_checktype(db_type) != db_type) 

    {

      value= res ? res->c_ptr() : "NULL";