diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-11-19 21:48:08 -0200 |
| commit | 5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f (patch) | |
| tree | d21225ac09b301f317ca89093128769a5ede9fbb /sql/item_subselect.cc | |
| parent | 780871d8b90fe3146db39b4be65ebedb309b9f9b (diff) | |
| parent | 5128b54c38ae183d18a29e00b318c22046445715 (diff) | |
| download | mariadb-git-5aeeaaf507ac87f6ff56806fe8a356cea7d4a48f.tar.gz | |
Manual merge of mysql-next-mr-runtime upstream.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 0ce9c555fea..a619827b2d3 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1740,8 +1740,6 @@ subselect_union_engine::subselect_union_engine(st_select_lex_unit *u, :subselect_engine(item_arg, result_arg) { unit= u; - if (!result_arg) //out of memory - current_thd->fatal_error(); unit->item= item_arg; } @@ -1753,10 +1751,7 @@ int subselect_single_select_engine::prepare() join= new JOIN(thd, select_lex->item_list, select_lex->options | SELECT_NO_UNLOCK, result); if (!join || !result) - { - thd->fatal_error(); //out of memory - return 1; - } + return 1; /* Fatal error is set already. */ prepared= 1; SELECT_LEX *save_select= thd->lex->current_select; thd->lex->current_select= select_lex; |