bk commit into 4.1 tree (mats:1.2188) BUG#8412

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
4.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2188 05/02/23 20:59:00 mats@stripped +1 -0
  Bug#8412: Setting error code to 0 on statements that cannot fail.

  sql/log.cc
    1.162 05/02/23 20:58:56 mats@stripped +3 -1
    Setting error code to 0 on SQL statements that cannot fail.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	romeo.kindahl.net
# Root:	/home/bk/b8412-mysql-4.1

--- 1.161/sql/log.cc	2005-02-23 19:58:51 +01:00
+++ 1.162/sql/log.cc	2005-02-23 20:58:56 +01:00
@@ -1322,6 +1322,7 @@
                              (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 @@
                                "'", 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 @@
 	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;
       }