diff options
author | unknown <serg@serg.mylan> | 2005-02-17 13:52:16 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-02-17 13:52:16 +0100 |
commit | c5c497164fbc48bcc50770ced833a07788082aaf (patch) | |
tree | b920a7ed5633935af693da76909cc6f626123729 /mysql-test/r/rpl_charset.result | |
parent | 98db5e571fd01f063ae56aa2492f8d01a418815a (diff) | |
download | mariadb-git-c5c497164fbc48bcc50770ced833a07788082aaf.tar.gz |
post-review fixes. Now ROLLBACK is done in Format_description_log_event
mysql-test/t/mix_innodb_myisam_binlog.test:
fix for --ps-protocol
Diffstat (limited to 'mysql-test/r/rpl_charset.result')
-rw-r--r-- | mysql-test/r/rpl_charset.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result index c92368c6407..d105e208777 100644 --- a/mysql-test/r/rpl_charset.result +++ b/mysql-test/r/rpl_charset.result @@ -175,6 +175,7 @@ select hex(c1), hex(c2) from t1; hex(c1) hex(c2) CDF32C20E7E020F0FBE1E0EBEAF3 CDF32C20E7E020F0FBE1E0EBEAF3 /*!40019 SET @@session.max_insert_delayed_threads=0*/; +ROLLBACK; SET TIMESTAMP=1000000000; SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1; SET @@session.sql_mode=0; @@ -244,5 +245,4 @@ CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255)); SET TIMESTAMP=1000000000; SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30; INSERT INTO t1 (c1, c2) VALUES ('Ну, за рыбалку','Ну, за рыбалку'); -ROLLBACK; drop table t1; |