diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-05-15 19:45:42 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-05-15 19:45:42 -0400 |
| commit | 9906138343428c9ab1f9fc2f17490bb06ca2ac58 (patch) | |
| tree | e0367d45ae9e212b5fc86960272efd604d3e35e4 /mysql-test/r/mysqlbinlog.result | |
| parent | 496ec47d220591453163cc303fd9bea569991e51 (diff) | |
| parent | 55012e427bc4b3b6a5ffa070e229c519c8cd0b98 (diff) | |
| download | mariadb-git-9906138343428c9ab1f9fc2f17490bb06ca2ac58.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570
BitKeeper/deleted/.del-binlog_innodb.result:
Auto merged
sql/sp_head.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_stm_ctype_ucs.result:
need to re-record.
mysql-test/suite/rpl/r/rpl_sp.result:
need to re-record.
mysql-test/r/mysqlbinlog.result:
manual merge.
mysql-test/suite/rpl/t/rpl_sp.test:
manual merge.
sql/sp.cc:
manual merge.
sql/sp_head.h:
manual merge.
Diffstat (limited to 'mysql-test/r/mysqlbinlog.result')
| -rw-r--r-- | mysql-test/r/mysqlbinlog.result | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 7c5fdf5f3d0..815ef8003de 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -303,9 +303,7 @@ 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() +CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`() begin select 1; end |