Commit e571163e authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents 2b518223 c3f73a42

sql/ha_blackhole.cc

+2 −1
Original line number Diff line number Diff line
@@ -129,8 +129,9 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd, 
                                         THR_LOCK_DATA **to,

                                         enum thr_lock_type lock_type)

{

  if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)

    lock.type=lock_type;

  *to++= &lock;



  return to;

}

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 
    if ((pos= find_type(&table->keynames, name->ptr(), name->length(), 1)) <=

	0)

    {

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr_safe(),

	       table->real_name);

      map->set_all();

      return 1;