Commit 2c7fb8f2 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents d560d638 1b221d24

sql/sql_cache.cc

+5 −0
Original line number Diff line number Diff line
@@ -830,6 +830,11 @@ sql mode: 0x%lx, sort len: %lu, conncat len: %lu", 
                          flags.sql_mode,

                          flags.max_sort_length,

                          flags.group_concat_max_len));

    /*

     Make InnoDB to release the adaptive hash index latch before

     acquiring the query cache mutex.

    */

    ha_release_temporary_latches(thd);

    STRUCT_LOCK(&structure_guard_mutex);



    if (query_cache_size == 0)

sql/sql_cursor.cc

+1 −2
Original line number Diff line number Diff line
@@ -445,9 +445,8 @@ Sensitive_cursor::fetch(ulong num_rows) 
  if (error == NESTED_LOOP_CURSOR_LIMIT)

    join->resume_nested_loop= TRUE;



#ifdef USING_TRANSACTIONS

    ha_release_temporary_latches(thd);

#endif



  /* Grab free_list here to correctly free it in close */

  thd->restore_active_arena(this, &backup_arena);