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

Merge mysql.com:/opt/local/work/mysql-4.1-16365

Browse Source 
into  mysql.com:/opt/local/work/mysql-5.0-merge
This commit is contained in:
konstantin@mysql.com
2006-04-12 18:30:54 +04:00
parent 7c70159097 a81ea4a830
commit 75792fc0dc
10 changed files with 397 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_prepare.cc
View File

@ -1848,8 +1848,11 @@ void mysql_stmt_prepare(THD *thd, const char *packet, uint packet_length)
if (thd->stmt_map.insert(stmt))
{
delete stmt;
DBUG_VOID_RETURN; /* out of memory */
/*
The error is set in the insert. The statement itself
will be also deleted there (this is how the hash works).
*/
DBUG_VOID_RETURN;
}
/* Reset warnings from previous command */
@ -2026,9 +2029,14 @@ void mysql_sql_stmt_prepare(THD *thd)
DBUG_VOID_RETURN; /* out of memory */
}
if (stmt->set_name(name) || thd->stmt_map.insert(stmt))
if (thd->stmt_map.insert(stmt))
{
delete stmt;
/* The statement is deleted and an error is set if insert fails */
DBUG_VOID_RETURN;
}
if (stmt->set_name(name))
{
thd->stmt_map.erase(stmt);
DBUG_VOID_RETURN;
}