diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2004-02-03 22:54:59 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2004-02-03 22:54:59 +0200 |
| commit | 9e62e21daa37e6ca8f721d730024b9b0d7a2953e (patch) | |
| tree | 0924abbb7ee67bde55b942a0a4fdc0bdea617fea /sql/sql_acl.cc | |
| parent | 5ba24f84e16150fe7dc861e07dd3d349addfc6ff (diff) | |
| download | mariadb-git-9e62e21daa37e6ca8f721d730024b9b0d7a2953e.tar.gz | |
sql_acl.cc:
Fix for a bug #2546 in 4.1.2 that prevented table / column privileges from being loaded on startup.
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 282a9afa038..0a0b3feeadf 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2543,7 +2543,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 */ @@ -2562,7 +2562,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; |