diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
| commit | 63e56390a3f1a4f80642932a790ab74f28de8010 (patch) | |
| tree | 8b611255f83ad274f072855f5acfe484a971de87 /sql/thr_malloc.cc | |
| parent | 905d715f10e711860311e0a10488c6bb5e19ee49 (diff) | |
| download | mariadb-git-63e56390a3f1a4f80642932a790ab74f28de8010.tar.gz | |
WL#2110 (SIGNAL)
WL#2265 (RESIGNAL)
Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
Diffstat (limited to 'sql/thr_malloc.cc')
| -rw-r--r-- | sql/thr_malloc.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/thr_malloc.cc b/sql/thr_malloc.cc index 0764fe8be33..ed17f7968c0 100644 --- a/sql/thr_malloc.cc +++ b/sql/thr_malloc.cc @@ -44,9 +44,10 @@ extern "C" { returned in the error packet. - SHOW ERROR/SHOW WARNINGS may be empty. */ - thd->main_da.set_error_status(thd, - ER_OUT_OF_RESOURCES, - ER(ER_OUT_OF_RESOURCES)); + thd->stmt_da->set_error_status(thd, + ER_OUT_OF_RESOURCES, + ER(ER_OUT_OF_RESOURCES), + NULL); } } } |