diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2004-02-11 19:15:02 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2004-02-11 19:15:02 +0200 |
| commit | 8c225bca9682f1fdc02e9660cddef5f263a71d41 (patch) | |
| tree | 2d334f1117c6263ed219332515c5925f2b2399bf /sql/sql_acl.cc | |
| parent | f2753fe9ac04edac1e8b968d29e77178b4e8c0a5 (diff) | |
| parent | 425ae9185d10c61b2b2b22e551dd9f96927b8efb (diff) | |
| download | mariadb-git-8c225bca9682f1fdc02e9660cddef5f263a71d41.tar.gz | |
merge fixes
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c500f0cf1f7..17b4a4a0eee 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2551,7 +2551,7 @@ my_bool grant_init(THD *org_thd) do { GRANT_TABLE *mem_check; - if (!(mem_check=new GRANT_TABLE(t_table,c_table)) || !mem_check->ok()) + if (!(mem_check=new GRANT_TABLE(t_table,c_table))) { /* This could only happen if we are out memory */ grant_option= FALSE; /* purecov: deadcode */ @@ -2570,7 +2570,7 @@ my_bool grant_init(THD *org_thd) } } - if (my_hash_insert(&column_priv_hash,(byte*) mem_check)) + if (mem_check->ok() && my_hash_insert(&column_priv_hash,(byte*) mem_check)) { grant_option= FALSE; goto end_unlock; |