List:Commits« Previous MessageNext Message »
From:konstantin Date:January 4 2006 6:39pm
Subject:bk commit into 5.0 tree (konstantin:1.2012)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.2012 06/01/04 21:39:39 konstantin@stripped +2 -0
  Post-merge fixes.

  sql/sql_base.cc
    1.322 06/01/04 21:39:33 konstantin@stripped +2 -1
    A post-merge fix.

  sql/sql_acl.cc
    1.188 06/01/04 21:39:33 konstantin@stripped +0 -1
    A post-merge fix.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-merge

--- 1.187/sql/sql_acl.cc	2006-01-04 17:49:40 +03:00
+++ 1.188/sql/sql_acl.cc	2006-01-04 21:39:33 +03:00
@@ -2245,7 +2245,6 @@
   uint len;
   GRANT_NAME *grant_name,*found=0;
   HASH_SEARCH_STATE state;
-  GRANT_TABLE *grant_table,*found=0;
 
   len  = (uint) (strmov(strmov(strmov(helping,user)+1,db)+1,tname)-helping)+ 1;
   for (grant_name= (GRANT_NAME*) hash_first(name_hash, (byte*) helping,

--- 1.321/sql/sql_base.cc	2006-01-04 17:49:40 +03:00
+++ 1.322/sql/sql_base.cc	2006-01-04 21:39:33 +03:00
@@ -1624,7 +1624,8 @@
   {
     char *key= table->s->table_cache_key;
     uint key_length= table->s->key_length;
-    for (TABLE *search= (TABLE*) hash_search(&open_cache, (byte*) key,
+    HASH_SEARCH_STATE state;
+    for (TABLE *search= (TABLE*) hash_first(&open_cache, (byte*) key,
                                              key_length, &state);
 	 search ;
          search= (TABLE*) hash_next(&open_cache, (byte*) key,
Thread
bk commit into 5.0 tree (konstantin:1.2012)konstantin4 Jan