summaryrefslogtreecommitdiff
path: root/mysql-test/suite/binlog
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-04-02 20:47:16 +0200
committerunknown <mkindahl@dl145h.mysql.com>2008-04-02 20:47:16 +0200
commit505b93e98d3b2f3a8d529a875710ad71d12194bb (patch)
tree65bcffca5326a379b284fbf9b7ab90fe415bb52f /mysql-test/suite/binlog
parent49134a7ed99c3e16815c723d8c60361a82dfe315 (diff)
downloadmariadb-git-505b93e98d3b2f3a8d529a875710ad71d12194bb.tar.gz
Post-merge fixes to make tests pass.
mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result: Result file change.
Diffstat (limited to 'mysql-test/suite/binlog')
-rw-r--r--mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
index a066928fc13..49aa64adfb5 100644
--- a/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
+++ b/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
@@ -17,7 +17,7 @@ ROLLBACK/*!*/;
use test/*!*/;
SET TIMESTAMP=10000/*!*/;
SET @@session.pseudo_thread_id=999999999/*!*/;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;
+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
SET @@session.sql_mode=0/*!*/;
SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
/*!\C latin1 *//*!*/;