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

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

Browse source 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
This commit is contained in:
thek@adventure.(none) 2008-04-01 10:44:56 +02:00
commit 1cc64d4eab
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/grant.result
View file

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

7
mysql-test/t/grant.test
View file

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

2
mysys/my_thr_init.c
View file

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

5
sql/sql_acl.cc
View file

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