diff options
| author | mats@mysql.com <> | 2005-02-23 20:59:00 +0100 |
|---|---|---|
| committer | mats@mysql.com <> | 2005-02-23 20:59:00 +0100 |
| commit | 30ade5b57e65224af0745f9cd1ca1f5474434f35 (patch) | |
| tree | 490769915929b39a11d58e86408d0481eccdcb85 /sql/log.cc | |
| parent | 6ad51ffb3cd90cb80d53504856c22592e1a6b075 (diff) | |
| download | mariadb-git-30ade5b57e65224af0745f9cd1ca1f5474434f35.tar.gz | |
Bug#8412: Setting error code to 0 on statements that cannot fail.
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc index 32574ca4a0d..c8a3b512b6d 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1322,6 +1322,7 @@ COLLATION_CONNECTION=%u,COLLATION_DATABASE=%u,COLLATION_SERVER=%u", (uint) thd->variables.collation_server->number); Query_log_event e(thd, buf, written, 0, FALSE); e.set_log_pos(this); + e.error_code = 0; // This statement cannot fail (see [1]). if (e.write(file)) goto err; } @@ -1338,6 +1339,7 @@ COLLATION_CONNECTION=%u,COLLATION_DATABASE=%u,COLLATION_SERVER=%u", "'", NullS); Query_log_event e(thd, buf, buf_end - buf, 0, FALSE); e.set_log_pos(this); + e.error_code = 0; // This statement cannot fail (see [1]). if (e.write(file)) goto err; } @@ -1389,8 +1391,8 @@ COLLATION_CONNECTION=%u,COLLATION_DATABASE=%u,COLLATION_SERVER=%u", p= strmov(strmov(buf, "SET CHARACTER SET "), thd->variables.convert_set->name); Query_log_event e(thd, buf, (ulong) (p - buf), 0); - e.error_code = 0; // This statement cannot fail (see [1]). e.set_log_pos(this); + e.error_code = 0; // This statement cannot fail (see [1]). if (e.write(file)) goto err; } |