mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanups during review

Browse source
This commit is contained in:
monty@mysql.com 2005-03-29 12:37:36 +03:00
parent 7b0e872695
commit dd4b0710dd
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ndb/src/ndbapi/DictCache.cpp
View file

@ -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;

9
sql/sql_acl.cc
View file

@ -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 <LEX_USER> &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)
{

2
sql/sql_yacc.yy
View file

@ -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,