Bug#8412: merged from 4.1

sql/log.cc:
  Merge from 4.1

mysql-test/r/rpl_insert_id.result

@@ -68,3 +68,8 @@ b	c
 9	13
 drop table t1;
 drop table t2;
+SET TIMESTAMP=1000000000;
+CREATE TABLE t1 ( a INT UNIQUE );
+SET FOREIGN_KEY_CHECKS=0;
+INSERT INTO t1 VALUES (1),(1);
+Duplicate entry '1' for key 1

mysql-test/t/rpl_insert_id.test

@@ -61,3 +61,19 @@ drop table t2;
 save_master_pos;
 connection slave;
 sync_with_master;
+
+#
+# Bug#8412: Error codes reported in binary log for CHARACTER SET,
+#           FOREIGN_KEY_CHECKS
+#
+connection master;
+SET TIMESTAMP=1000000000;
+CREATE TABLE t1 ( a INT UNIQUE );
+SET FOREIGN_KEY_CHECKS=0;
+--error 1062
+INSERT INTO t1 VALUES (1),(1);
+sync_slave_with_master;
+
+
+
+

sql/log.cc

@@ -1737,7 +1737,9 @@ COLLATION_CONNECTION=%u,COLLATION_DATABASE=%u,COLLATION_SERVER=%u",
       }
     }
 
-    /* Write the SQL command */
+    /* 
+       Write the SQL command 
+     */
 
     if (event_info->write(file))
       goto err;