List:Internals« Previous MessageNext Message »
From:sinisa Date:February 3 2004 8:55pm
Subject:bk commit into 4.1 tree (Sinisa:1.1673)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1673 04/02/03 22:54:59 Sinisa@stripped +1 -0
  sql_acl.cc:
    Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup. 

  sql/sql_acl.cc
    1.103 04/02/03 22:53:37 Sinisa@stripped +2 -2
    Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup. 

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.102/sql/sql_acl.cc	Sun Dec 21 22:18:55 2003
+++ 1.103/sql/sql_acl.cc	Tue Feb  3 22:53:37 2004
@@ -2543,7 +2543,7 @@
   do
   {
     GRANT_TABLE *mem_check;
-    if (!(mem_check=new GRANT_TABLE(t_table,c_table)) || mem_check->ok())
+    if (!(mem_check=new GRANT_TABLE(t_table,c_table)))
     {
       /* This could only happen if we are out memory */
       grant_option= FALSE;			/* purecov: deadcode */
@@ -2562,7 +2562,7 @@
       }
     }
 
-    if (my_hash_insert(&column_priv_hash,(byte*) mem_check))
+    if (mem_check->ok() && my_hash_insert(&column_priv_hash,(byte*) mem_check))
     {
       grant_option= FALSE;
       goto end_unlock;
Thread
bk commit into 4.1 tree (Sinisa:1.1673)sinisa3 Feb