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

Post-merge fixes for bugs 34587 and 32265.

Browse Source
This commit is contained in:
davi@buzz.(none)
2008-02-20 23:30:29 -02:00
parent bf9142825d
commit 919ccd9111
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_cursor.cc
View File

@ -588,7 +588,7 @@ int Materialized_cursor::fill_item_list(THD *thd, List<Item> &send_fields)
end:
thd->restore_active_arena(this, &backup_arena);
/* Check for thd->is_error() in case of OOM */
return rc || thd->net.report_error;
return rc || thd->is_error();
}
int Materialized_cursor::open(JOIN *join __attribute__((unused)))