1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com 2005-03-29 12:58:31 +03:00
commit c4467b817d
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 *
Ndb_local_table_info::create(NdbTableImpl *table_impl, Uint32 sz) 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); void *data= malloc(tot_size);
if (data == 0) if (data == 0)
return 0; return 0;

9
sql/sql_acl.cc
View File

@ -2733,7 +2733,8 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
pthread_mutex_lock(&acl_cache->lock); pthread_mutex_lock(&acl_cache->lock);
error=replace_user_table(thd, tables[0].table, *Str, error=replace_user_table(thd, tables[0].table, *Str,
0, revoke_grant, create_new_users, 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); pthread_mutex_unlock(&acl_cache->lock);
if (error) if (error)
{ {
@ -2939,7 +2940,8 @@ bool mysql_procedure_grant(THD *thd, TABLE_LIST *table_list,
pthread_mutex_lock(&acl_cache->lock); pthread_mutex_lock(&acl_cache->lock);
error=replace_user_table(thd, tables[0].table, *Str, error=replace_user_table(thd, tables[0].table, *Str,
0, revoke_grant, create_new_users, 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); pthread_mutex_unlock(&acl_cache->lock);
if (error) if (error)
{ {
@ -3065,7 +3067,8 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
} }
if (replace_user_table(thd, tables[0].table, *Str, if (replace_user_table(thd, tables[0].table, *Str,
(!db ? rights : 0), revoke_grant, create_new_users, (!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; result= -1;
else if (db) else if (db)
{ {

2
sql/sql_yacc.yy
View File

@ -1398,7 +1398,7 @@ create_function_tail:
uint unused1= 0; uint unused1= 0;
int unused2= 0; int unused2= 0;
if (!(new_field= new_create_field(YYTHD, "", if (!(new_field= new_create_field(YYTHD, (char*) "",
(enum enum_field_types)$8, (enum enum_field_types)$8,
lex->length, lex->dec, lex->type, lex->length, lex->dec, lex->type,
(Item *)0, (Item *) 0, &cmt, 0, (Item *)0, (Item *) 0, &cmt, 0,