database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base

Browse Source 
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
This commit is contained in:
malff@lambda.hsd1.co.comcast.net.
2007-11-27 08:56:43 -07:00
parent 3cf2733086 f035f5e05d
commit 352e59b37b
17 changed files with 630 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -7070,7 +7070,7 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
for (; lock_p < end_p; lock_p++)
{
if ((*lock_p)->type == TL_WRITE)
if ((*lock_p)->type >= TL_WRITE_ALLOW_WRITE)
{
my_error(ER_LOCK_OR_ACTIVE_TRANSACTION, MYF(0));
return 1;