From 5c6eb5222ec12fe38095b2e69d1b4732b04e3a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Wed, 4 Feb 2015 16:50:29 +0200 Subject: [PATCH] Fix test failure. --- .../suite/innodb/r/innodb-mdev-7055.result | Bin 326 -> 325 bytes mysql-test/suite/innodb/t/innodb-mdev-7055.test | 11 ++++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-mdev-7055.result b/mysql-test/suite/innodb/r/innodb-mdev-7055.result index 9e02163baade185c32fda0e1c2629d771fd568f8..67a30ba783fb80eaff1e64f3ce3a2dcdf438d01b 100644 GIT binary patch delta 58 zcmX@cbd<@kIJHEbP=pZx3ziXM diff --git a/mysql-test/suite/innodb/t/innodb-mdev-7055.test b/mysql-test/suite/innodb/t/innodb-mdev-7055.test index 2e19dd74108..d68be46c35a 100644 --- a/mysql-test/suite/innodb/t/innodb-mdev-7055.test +++ b/mysql-test/suite/innodb/t/innodb-mdev-7055.test @@ -1,9 +1,14 @@ -- source include/have_innodb.inc -# MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in file rem0rec.cc line 845 -DROP DATABASE test;CREATE DATABASE test;USE test; +# MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len +# || col->mtype == 5 || (col->len == 0 && col->mtype == 1) in +# file rem0rec.cc line 845 +set @old_character_set=@@character_set_connection; set character_set_connection=ucs2; create TABLE t1 engine=innodb select if(0=0,'Y','N'); insert INTO t1 values(date_format('2001-01-01','%W')); select * from t1; -drop table t1; \ No newline at end of file +drop table t1; +--disable_query_log +set @@character_set_connection=@old_character_set; +