diff options
| author | malff@lambda.hsd1.co.comcast.net. <> | 2007-11-27 08:56:43 -0700 |
|---|---|---|
| committer | malff@lambda.hsd1.co.comcast.net. <> | 2007-11-27 08:56:43 -0700 |
| commit | 352e59b37b652bccedd8fb15eb02eb044e1c02c2 (patch) | |
| tree | c7ade707b0ce4031c86b16897a8429f2da921aad /sql/sql_parse.cc | |
| parent | 3cf2733086e5c655632541495ffdab3e20000c6f (diff) | |
| parent | f035f5e05df4b0128962f1a459218768564ced1c (diff) | |
| download | mariadb-git-352e59b37b652bccedd8fb15eb02eb044e1c02c2.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
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; |