Commit 5ae33d6e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/wax/mysql/mysql-4.1 

into mysql.com:/home/wax/mysql/mysql-4.1test2
parents 842cde98 942ae30f

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

myisam/mi_check.c

+2 −0
Original line number Diff line number Diff line
@@ -1466,12 +1466,14 @@ static int writekeys(MI_CHECK *param, register MI_INFO *info, byte *buff, 
        if (_mi_ft_add(info,i,(char*) key,buff,filepos))

	  goto err;

      }

#ifdef HAVE_SPATIAL

      else if (info->s->keyinfo[i].flag & HA_SPATIAL)

      {

	uint key_length=_mi_make_key(info,i,key,buff,filepos);

	if (rtree_insert(info, i, key, key_length))

	  goto err;

      }

#endif /*HAVE_SPATIAL*/

      else

      {

	uint key_length=_mi_make_key(info,i,key,buff,filepos);

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";