diff options
| author | unknown <thek@adventure.(none)> | 2008-03-26 11:07:10 +0100 |
|---|---|---|
| committer | unknown <thek@adventure.(none)> | 2008-03-26 11:07:10 +0100 |
| commit | 6df9a37d147260ce62dcbb7fac7634b6d6d21f98 (patch) | |
| tree | 09cab07bc297c76bfb24b418dc7e2d5d3d061b1d /sql/sql_acl.cc | |
| parent | 001829914befbbaec672334b298d152fa8727060 (diff) | |
| parent | a3126bfc2ecdbe321ff05e5810e2eb6b631d02ca (diff) | |
| download | mariadb-git-6df9a37d147260ce62dcbb7fac7634b6d6d21f98.tar.gz | |
Merge adventure.(none):/home/thek/Development/cpp/bug33275/my50-bug33275
into adventure.(none):/home/thek/Development/cpp/bug33275/my51-bug33275
sql/sql_acl.cc:
Auto merged
mysql-test/r/grant.result:
Manual merge
mysql-test/t/grant.test:
Manual merge
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 9a218395721..db0292f92e3 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -691,6 +691,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)) { @@ -3773,7 +3775,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. |