From dd4b0710dd169d78bbc53c03d739c39bf9d16248 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Tue, 29 Mar 2005 12:37:36 +0300 Subject: [PATCH] Cleanups during review --- ndb/src/ndbapi/DictCache.cpp | 2 +- sql/sql_acl.cc | 9 ++++++--- sql/sql_yacc.yy | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ndb/src/ndbapi/DictCache.cpp b/ndb/src/ndbapi/DictCache.cpp index 9cdd68272ad..da9d5b70d47 100644 --- a/ndb/src/ndbapi/DictCache.cpp +++ b/ndb/src/ndbapi/DictCache.cpp @@ -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; diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 0a5939428cd..c98c22c3b91 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2729,7 +2729,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, 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 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list, 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 @@ bool mysql_grant(THD *thd, const char *db, List &list, } 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) { diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 8141de31275..bfbe8faebd3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1398,7 +1398,7 @@ create_function_tail: 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,