diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-11-27 08:56:43 -0700 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-11-27 08:56:43 -0700 |
| commit | 77ab800e7710d8f8e5706ccc1f39689ba8a9d059 (patch) | |
| tree | c7ade707b0ce4031c86b16897a8429f2da921aad /sql/sql_parse.cc | |
| parent | d295bfaa769fd895f392f6058295b83928732d14 (diff) | |
| parent | 7917c7c06020624c0e24a254f5e9ca5c19a314aa (diff) | |
| download | mariadb-git-77ab800e7710d8f8e5706ccc1f39689ba8a9d059.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 16a64c48cdd..fc134cad297 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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; |