diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-10-03 16:54:26 +0300 |
| commit | 8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62 (patch) | |
| tree | f4c99a6c2b4ed9003c893e7098a0c957d720e317 /sql/net_pkg.cc | |
| parent | 95e772b65678b182bff5b52f3f5386d894419147 (diff) | |
| download | mariadb-git-8f7a2b2785cec83f3c00047b5d3fb76d85ecbe62.tar.gz | |
Update after last merge. Fixes some wrong test results.
libmysql/libmysql.c:
Removed obsolete function (now in strings library)
mysql-test/r/rpl_log.result:
Updated results for 4.1
mysql-test/r/rpl_log_pos.result:
Updated results for 4.1
sql/item_strfunc.cc:
Added missing system_charset_info
sql/log_event.cc:
Portability fixes. More debugging.
sql/net_pkg.cc:
Added back setting of query_error as slave code is depeneding on this.
sql/sql_acl.cc:
Update after last merge
sql/sql_lex.cc:
Update after last merge
sql/sql_parse.cc:
Update after last merge
sql/sql_prepare.cc:
Update after last merge
sql/time.cc:
Update after last merge.
More comments
Diffstat (limited to 'sql/net_pkg.cc')
| -rw-r--r-- | sql/net_pkg.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/net_pkg.cc b/sql/net_pkg.cc index b804724564e..ef90c12586b 100644 --- a/sql/net_pkg.cc +++ b/sql/net_pkg.cc @@ -31,6 +31,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) net->last_error : "NULL")); query_cache_abort(net); + thd->query_error= 1; // needed to catch query errors during replication if (!err) { if (sql_errno) @@ -132,6 +133,7 @@ net_printf(THD *thd, uint errcode, ...) DBUG_ENTER("net_printf"); DBUG_PRINT("enter",("message: %u",errcode)); + thd->query_error= 1; // needed to catch query errors during replication query_cache_abort(net); // Safety va_start(args,errcode); /* |