diff options
| author | unknown <serg@serg.mylan> | 2004-11-24 17:22:29 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-24 17:22:29 +0100 |
| commit | 0052dc8210b68a83736f547abf41f76a977e2826 (patch) | |
| tree | a58c2b990a3c6e8f7ba2f923989fbb72534bfd38 /sql/sql_parse.cc | |
| parent | 85593e9079926a09ad42ec4572a691092db0033b (diff) | |
| download | mariadb-git-0052dc8210b68a83736f547abf41f76a977e2826.tar.gz | |
send_warning removed
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 89807765421..a966d596c7c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3579,9 +3579,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; @@ -3591,9 +3592,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; |