diff options
author | monty@mysql.com <> | 2003-12-26 12:32:24 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2003-12-26 12:32:24 +0200 |
commit | 8d23612303323fe810bc9f67a984564fb4b526cd (patch) | |
tree | fc3516ac40155035b7af0243cedd3ac0743790ab /sql/sql_acl.cc | |
parent | 1547a03c797fa547f1664d9c56a313daf62972bc (diff) | |
parent | 458a947f6c5edae7470f4b30d9b92d4e9862a0dc (diff) | |
download | mariadb-git-8d23612303323fe810bc9f67a984564fb4b526cd.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
Diffstat (limited to 'sql/sql_acl.cc')
-rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 282a9afa038..f2e7819a51f 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)) || !mem_check->ok()) { /* This could only happen if we are out memory */ grant_option= FALSE; /* purecov: deadcode */ |