diff options
| author | unknown <igor@olga.mysql.com> | 2007-01-25 21:01:28 -0800 |
|---|---|---|
| committer | unknown <igor@olga.mysql.com> | 2007-01-25 21:01:28 -0800 |
| commit | 483a41bbb7ef9c5b5f545e3fc9b70e430fab1287 (patch) | |
| tree | 1fa0a5171e177f947dcf3cdf53635526be06a19d /sql/item_subselect.cc | |
| parent | 24903ed56ca2cceb3b9cb9f690ab47cc95e072be (diff) | |
| parent | da561a802caff95d755b8d2061c27c248f22e3cd (diff) | |
| download | mariadb-git-483a41bbb7ef9c5b5f545e3fc9b70e430fab1287.tar.gz | |
Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug24653
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
sql/filesort.cc:
Manual merge
sql/item_cmpfunc.h:
Manual merge
sql/item_subselect.cc:
Manual merge
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index e19815960a6..7a2d749524b 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -195,7 +195,9 @@ bool Item_subselect::exec() { int res; - res= engine->exec(); + if (thd->net.report_error) + /* Do not execute subselect in case of a fatal error */ + return 1; if (engine_changed) { |