diff options
| author | unknown <thek@adventure.(none)> | 2008-03-26 14:20:12 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-03-26 14:20:12 +0100 |
| commit | 4d001035f3d173402edd4be3f8ad766234096f0e (patch) | |
| tree | 396a0a31eedf1f3c1693560c8d286f293443bdc4 /sql/sql_acl.cc | |
| parent | 27c0540bd8e785499accbd4777bdb5067911cce9 (diff) | |
| parent | 266fc6121b15f868e16ec5aa42f277673efff684 (diff) | |
| download | mariadb-git-4d001035f3d173402edd4be3f8ad766234096f0e.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug33275/my51-bug33275
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index f84e33cceb8..22888edade5 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -695,6 +695,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)) { @@ -3784,7 +3786,8 @@ my_bool grant_reload(THD *thd) tables[0].db= tables[1].db= (char *) "mysql"; tables[0].next_local= tables[0].next_global= tables+1; tables[0].lock_type= tables[1].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. |