diff options
| author | unknown <serg@serg.mylan> | 2004-11-27 12:37:03 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-27 12:37:03 +0100 |
| commit | 87347253cee1e7bad8c918988a15e70ee6e25715 (patch) | |
| tree | ac764cfed9bad42778723fea831db046fc083d4e /sql/sql_parse.cc | |
| parent | 24ad655ab5469b4fa7f9b5ee2bcd69ca6fb47f70 (diff) | |
| parent | 368cde22ac949bf4380cb012af59149a6dded2d1 (diff) | |
| download | mariadb-git-87347253cee1e7bad8c918988a15e70ee6e25715.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bfe9db2859d..785d5a329ba 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3648,9 +3648,10 @@ create_error: message in the error log, so we don't send it. */ if ((thd->options & OPTION_STATUS_NO_TRANS_UPDATE) && !thd->slave_thread) - send_warning(thd,ER_WARNING_NOT_COMPLETE_ROLLBACK,0); - else - send_ok(thd); + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARNING_NOT_COMPLETE_ROLLBACK, + ER(ER_WARNING_NOT_COMPLETE_ROLLBACK)); + send_ok(thd); } else res= TRUE; @@ -3660,9 +3661,10 @@ create_error: if (!ha_rollback_to_savepoint(thd, lex->savepoint_name)) { if ((thd->options & OPTION_STATUS_NO_TRANS_UPDATE) && !thd->slave_thread) - send_warning(thd, ER_WARNING_NOT_COMPLETE_ROLLBACK, 0); - else - send_ok(thd); + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_WARNING_NOT_COMPLETE_ROLLBACK, + ER(ER_WARNING_NOT_COMPLETE_ROLLBACK)); + send_ok(thd); } else goto error; |