database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge fixes

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2004-02-11 19:15:02 +02:00
parent 8e6a2e98ae 451e423be4
commit 125fb04b87
9 changed files with 82 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.cc
View File

@ -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;