Commit a391ef8d authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-5.0


sql/sql_acl.cc:
  Auto merged
parents 73e15f57 51690eca

ndb/src/ndbapi/DictCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/sql_acl.cc

+6 −3
Original line number Diff line number Diff line
@@ -2733,7 +2733,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)

    {
@@ -2939,7 +2940,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)

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

                           (!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)

    {

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -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,