bk commit into 5.0 tree (monty:1.1842)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1842 05/03/29 12:37:36 monty@stripped +3 -0
  Cleanups during review

  sql/sql_yacc.yy
    1.355 05/03/29 12:37:33 monty@stripped +1 -1
    Removed compiler warning

  sql/sql_acl.cc
    1.146 05/03/29 12:37:33 monty@stripped +6 -3
    Fix for bool parameter

  ndb/src/ndbapi/DictCache.cpp
    1.12 05/03/29 12:37:33 monty@stripped +1 -1
    Simpler bit handling code

# 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:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0

--- 1.145/sql/sql_acl.cc	2005-03-23 20:18:16 +02:00
+++ 1.146/sql/sql_acl.cc	2005-03-29 12:37:33 +03:00
@@ -2729,7 +2729,8 @@
     pthread_mutex_lock(&acl_cache->lock);
     error=replace_user_table(thd, tables[0].table, *Str,
 			     0, revoke_grant, create_new_users,
-                             thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER);
+                             test(thd->variables.sql_mode &
+                                  MODE_NO_AUTO_CREATE_USER));
     pthread_mutex_unlock(&acl_cache->lock);
     if (error)
     {
@@ -2935,7 +2936,8 @@
     pthread_mutex_lock(&acl_cache->lock);
     error=replace_user_table(thd, tables[0].table, *Str,
 			     0, revoke_grant, create_new_users,
-                             thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER);
+                             test(thd->variables.sql_mode &
+                                  MODE_NO_AUTO_CREATE_USER));
     pthread_mutex_unlock(&acl_cache->lock);
     if (error)
     {
@@ -3061,7 +3063,8 @@
     }
     if (replace_user_table(thd, tables[0].table, *Str,
                            (!db ? rights : 0), revoke_grant, create_new_users,
-                           thd->variables.sql_mode & MODE_NO_AUTO_CREATE_USER))
+                           test(thd->variables.sql_mode &
+                                MODE_NO_AUTO_CREATE_USER)))
       result= -1;
     else if (db)
     {

--- 1.354/sql/sql_yacc.yy	2005-03-22 16:46:13 +02:00
+++ 1.355/sql/sql_yacc.yy	2005-03-29 12:37:33 +03:00
@@ -1398,7 +1398,7 @@
 	    uint unused1= 0;
 	    int unused2= 0;
 
-	    if (!(new_field= new_create_field(YYTHD, "",
+	    if (!(new_field= new_create_field(YYTHD, (char*) "",
 					      (enum enum_field_types)$8,
 			  		      lex->length, lex->dec, lex->type,
 			  		      (Item *)0, (Item *) 0, &cmt, 0,

--- 1.11/ndb/src/ndbapi/DictCache.cpp	2005-03-22 23:12:07 +02:00
+++ 1.12/ndb/src/ndbapi/DictCache.cpp	2005-03-29 12:37:33 +03:00
@@ -24,7 +24,7 @@
 Ndb_local_table_info *
 Ndb_local_table_info::create(NdbTableImpl *table_impl, Uint32 sz)
 {
-  Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7)>>3)<<3; // round to
Uint64
+  Uint32 tot_size= sizeof(NdbTableImpl *) + ((sz+7) & ~7); // round to Uint64
   void *data= malloc(tot_size);
   if (data == 0)
     return 0;