database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam

Browse Source 
Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1
This commit is contained in:
Marc Alff
2008-08-11 16:44:13 -06:00
parent b0d5c8a10b 2f3b860305
commit 7f228cf20e
8 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_cursor.cc
View File

@@ -155,6 +155,7 @@ int mysql_open_cursor(THD *thd, uint flags, select_result *result,
if (! (sensitive_cursor= new (thd->mem_root) Sensitive_cursor(thd, result)))
{
delete result_materialize;
result_materialize= NULL;
return 1;
}
@@ -212,6 +213,7 @@ int mysql_open_cursor(THD *thd, uint flags, select_result *result,
if ((rc= materialized_cursor->open(0)))
{
delete materialized_cursor;
materialized_cursor= NULL;
goto err_open;
}