MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Alex Ivanov Notebook Date:April 9 2006 1:49pm
Subject:bk commit into 5.1 tree (aivanov:1.2301)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of alexi. When alexi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2301 06/04/09 17:48:47 aivanov@stripped +3 -0
  Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
  into  mysql.com:/home/alexi/bugs/mysql-5.1-15758

  sql/sql_cursor.cc
    1.7 06/04/09 17:48:43 aivanov@stripped +0 -0
    SCCS merged

  sql/sql_class.cc
    1.253 06/04/09 17:48:43 aivanov@stripped +0 -0
    SCCS merged

  sql/sql_cache.cc
    1.93 06/04/09 17:48:42 aivanov@stripped +0 -0
    SCCS merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/bugs/mysql-5.1-15758/RESYNC

--- 1.92/sql/sql_cache.cc	2006-02-15 00:35:55 +03:00
+++ 1.93/sql/sql_cache.cc	2006-04-09 17:48:42 +04:00
@@ -830,6 +830,11 @@
                           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)

--- 1.6/sql/sql_cursor.cc	2006-02-25 21:35:08 +03:00
+++ 1.7/sql/sql_cursor.cc	2006-04-09 17:48:43 +04:00
@@ -445,9 +445,8 @@
   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);
 
Thread
bk commit into 5.1 tree (aivanov:1.2301)Alex Ivanov Notebook9 Apr