diff options
| author | unknown <monty@mysql.com> | 2003-12-26 12:32:24 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-26 12:32:24 +0200 |
| commit | 35fd38150acdbfedf8d1c7ca0db03953cbb21b8f (patch) | |
| tree | fc3516ac40155035b7af0243cedd3ac0743790ab /sql/sql_acl.cc | |
| parent | d55382369eb639417dd01a62ff4867f9213f10ce (diff) | |
| parent | 3f4d396dc33a68252f8db838d14192186f4ce342 (diff) | |
| download | mariadb-git-35fd38150acdbfedf8d1c7ca0db03953cbb21b8f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
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 */ |