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 bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com
2005-10-08 03:37:23 +03:00
parent dad1e2048d f577ebb88f
commit 17d7ba931d
33 changed files with 385 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_class.cc
View File

@ -1703,15 +1703,19 @@ Statement_map::Statement_map() :
int Statement_map::insert(Statement *statement)
{
int rc= my_hash_insert(&st_hash, (byte *) statement);
int res= my_hash_insert(&st_hash, (byte *) statement);
if (res)
return res;
if (statement->name.str)
{
if ((rc= my_hash_insert(&names_hash, (byte*)statement)))
if ((res= my_hash_insert(&names_hash, (byte*)statement)))
{
hash_delete(&st_hash, (byte*)statement);
return res;
}
}
if (rc == 0)
last_found_statement= statement;
return rc;
last_found_statement= statement;
return res;
}