Commit 1cc64d4e authored by thek@adventure.(none)'s avatar thek@adventure.(none)
Browse files

Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 

into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
parents 282825af 9b7a0e72

mysql-test/r/grant.result

+6 −0
Original line number Diff line number Diff line
@@ -1129,4 +1129,10 @@ DROP USER mysqltest_1@localhost; 
DROP DATABASE db27878;

use test;

DROP TABLE t1;

#

#  Bug#33275 Server crash when creating temporary table mysql.user

#

CREATE TEMPORARY TABLE mysql.user (id INT);

FLUSH PRIVILEGES;

DROP TABLE mysql.user;

End of 5.0 tests

mysql-test/t/grant.test

+7 −0
Original line number Diff line number Diff line
@@ -1153,4 +1153,11 @@ DROP DATABASE db27878; 
use test;

DROP TABLE t1;



--echo #

--echo #  Bug#33275 Server crash when creating temporary table mysql.user

--echo #

CREATE TEMPORARY TABLE mysql.user (id INT);

FLUSH PRIVILEGES;

DROP TABLE mysql.user;



--echo End of 5.0 tests

mysys/my_thr_init.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ void my_thread_global_end(void) 
#endif

}



static long thread_id=0;

static ulong thread_id=0;



/*

  Allocate thread specific memory for the thread, used by mysys and dbug

sql/sql_acl.cc

+4 −1
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ my_bool acl_reload(THD *thd) 
  tables[0].next_local= tables[0].next_global= tables+1;

  tables[1].next_local= tables[1].next_global= tables+2;

  tables[0].lock_type=tables[1].lock_type=tables[2].lock_type=TL_READ;

  tables[0].skip_temporary= tables[1].skip_temporary=

    tables[2].skip_temporary= TRUE;



  if (simple_open_n_lock_tables(thd, tables))

  {
@@ -3530,7 +3532,8 @@ my_bool grant_reload(THD *thd) 
  tables[0].next_local= tables[0].next_global= tables+1;

  tables[1].next_local= tables[1].next_global= tables+2;

  tables[0].lock_type= tables[1].lock_type= tables[2].lock_type= TL_READ;



  tables[0].skip_temporary= tables[1].skip_temporary=

    tables[2].skip_temporary= TRUE;

  /*

    To avoid deadlocks we should obtain table locks before

    obtaining LOCK_grant rwlock.