diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-05-16 11:35:15 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-05-16 11:35:15 -0400 |
| commit | 7d53cbc3a3c522197e4fd3791e8dd070ab05a4e7 (patch) | |
| tree | a6e935d6507bb10ab1bfe161ae8b9b2ddb16ee8a /mysql-test/r/mysqlbinlog.result | |
| parent | 7b79348edb3fb02b2a73ac7fda7cba1e37ee3d28 (diff) | |
| download | mariadb-git-7d53cbc3a3c522197e4fd3791e8dd070ab05a4e7.tar.gz | |
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.
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 815ef8003de..9c2ccc78429 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/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; |