Fix merge problems and re-record output for legitimate changes.

mysql-test/r/ctype_cp932_binlog_stm.result:
  New offsets because of quote marks.
mysql-test/r/mysqlbinlog.result:
  Re-add variables removed in merge at file-vers 1.47.
mysql-test/suite/binlog/r/binlog_database.result:
  create_string() output changes the quoting and inserts newlines.
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
  Change in quoting.
mysql-test/suite/rpl/r/rpl_sp.result:
  Adds quotes and newlines in creation of routines in binlog.

mysql-test/r/ctype_cp932_binlog_stm.result

@@ -34,15 +34,15 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	369	Query	1	535	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,
 d DECIMAL(10,2))
-master-bin.000001	535	Query	1	783	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
+master-bin.000001	535	Query	1	784	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `bug18293`(IN ins1 CHAR(50),
 IN ins2 CHAR(50) CHARACTER SET cp932,
 IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	783	Query	1	991	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	991	Query	1	1080	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1080	Query	1	1159	use `test`; DROP TABLE t4
+master-bin.000001	784	Query	1	992	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	992	Query	1	1081	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1081	Query	1	1160	use `test`; DROP TABLE t4
 End of 5.0 tests
 SHOW BINLOG EVENTS FROM 364;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error

mysql-test/r/mysqlbinlog.result

@@ -303,6 +303,8 @@ SET @@session.sql_mode=0/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
+SET @@session.lc_time_names=0/*!*/;
+SET @@session.collation_database=DEFAULT/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
 begin
 select 1;

mysql-test/suite/binlog/r/binlog_database.result

@@ -11,9 +11,11 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	create database testing_1
 master-bin.000001	#	Query	#	#	use `testing_1`; create table t1 (a int)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` function sf1 (a int) returns int return a+1
+master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11)
+return a+1
 master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` procedure sp1 (a int) insert into t1 values(a)
+master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int)
+insert into t1 values(a)
 master-bin.000001	#	Query	#	#	drop database testing_1
 set binlog_format=mixed;
 reset master;
@@ -28,9 +30,11 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	create database testing_1
 master-bin.000001	#	Query	#	#	use `testing_1`; create table t1 (a int)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` function sf1 (a int) returns int return a+1
+master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11)
+return a+1
 master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` procedure sp1 (a int) insert into t1 values(a)
+master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int)
+insert into t1 values(a)
 master-bin.000001	#	Query	#	#	drop database testing_1
 set binlog_format=row;
 reset master;
@@ -45,9 +49,11 @@ show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	create database testing_1
 master-bin.000001	#	Query	#	#	use `testing_1`; create table t1 (a int)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` function sf1 (a int) returns int return a+1
+master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` FUNCTION `sf1`(a int) RETURNS int(11)
+return a+1
 master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` trigger tr1 before insert on t1 for each row insert into t2 values (2*new.a)
-master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` procedure sp1 (a int) insert into t1 values(a)
+master-bin.000001	#	Query	#	#	use `testing_1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`(a int)
+insert into t1 values(a)
 master-bin.000001	#	Query	#	#	drop database testing_1
 show databases;
 Database

mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result

@@ -1023,11 +1023,11 @@ master-bin.000001	#	Xid	1	#	#
 master-bin.000001	#	Query	1	#	use `test_rpl`; ANALYZE TABLE t1
 master-bin.000001	#	Query	1	#	use `test_rpl`; OPTIMIZE TABLE t1
 master-bin.000001	#	Query	1	#	use `test_rpl`; REPAIR TABLE t1
-master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1 ()
+master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`()
 BEGIN
 UPDATE t1 SET b = 'test' WHERE a = 201;
 END
-master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE p2 ()
+master-bin.000001	#	Query	1	#	use `test_rpl`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p2`()
 BEGIN
 UPDATE t1 SET b = UUID() WHERE a = 202;
 END