diff options
| author | unknown <bell@52.0.168.192.in-addr.arpa> | 2005-02-23 19:22:52 +0200 |
|---|---|---|
| committer | unknown <bell@52.0.168.192.in-addr.arpa> | 2005-02-23 19:22:52 +0200 |
| commit | 2c1ef3c604fb87fe0f5484d4174bee72c59a88ae (patch) | |
| tree | 78f2044bceb113c001dadb36382ad3fe8363df7b /sql/protocol.cc | |
| parent | b1b896cfb3bbb3488d4e6b3e43a095e279590576 (diff) | |
| parent | e09a6c1a203e986b4c4d34cf8a8b72b39e4c573d (diff) | |
| download | mariadb-git-2c1ef3c604fb87fe0f5484d4174bee72c59a88ae.tar.gz | |
Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/protocol.cc:
Auto merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 03d02d37d51..f31462ddad1 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -59,6 +59,7 @@ void net_send_error(THD *thd, uint sql_errno, const char *err) uint length; char buff[MYSQL_ERRMSG_SIZE+2], *pos; #endif + const char *orig_err= err; NET *net= &thd->net; DBUG_ENTER("net_send_error"); DBUG_PRINT("enter",("sql_errno: %d err: %s", sql_errno, @@ -91,6 +92,7 @@ void net_send_error(THD *thd, uint sql_errno, const char *err) err=ER(sql_errno); /* purecov: inspected */ } } + orig_err= err; } #ifdef EMBEDDED_LIBRARY @@ -129,6 +131,8 @@ void net_send_error(THD *thd, uint sql_errno, const char *err) } VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length)); #endif /* EMBEDDED_LIBRARY*/ + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_errno, + orig_err ? orig_err : ER(sql_errno)); thd->is_fatal_error=0; // Error message is given thd->net.report_error= 0; @@ -242,6 +246,8 @@ net_printf_error(THD *thd, uint errcode, ...) strmake(net->last_error, text_pos, length); strmake(net->sqlstate, mysql_errno_to_sqlstate(errcode), SQLSTATE_LENGTH); #endif + push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode, + text_pos ? text_pos : ER(errcode)); thd->is_fatal_error=0; // Error message is given DBUG_VOID_RETURN; } |