From ada07435b42a6a3e739a386864ef8ab7f2a8838d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= Date: Tue, 10 Feb 2015 08:08:59 +0200 Subject: [PATCH] Fix test failure on innodb-mdev-7055. --- .../suite/innodb/r/innodb-mdev-7055.result | Bin 325 -> 97 bytes mysql-test/suite/innodb/t/innodb-mdev-7055.test | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/innodb/r/innodb-mdev-7055.result b/mysql-test/suite/innodb/r/innodb-mdev-7055.result index 67a30ba783fb80eaff1e64f3ce3a2dcdf438d01b..167ace92f32d0b00180de93f361049ae4d42a65f 100644 GIT binary patch delta 10 RcmX@glsNIQ&tyeLQ2-aA1Csy% literal 325 zcmZ{fK}*Cy428Y!{EA#;y0SuB(1WE|MGu0kmxX0dWp*ZA2ilBeQvLhJf`=7^91>pM zmzRtJT^d90-yJ(I$bCj>yY6i6eIi0HF;QbwhyT=e_PK71XLN$Fdw6_(2B`q)6bai% zl)@1*j>>{K6lGg(?7?pA)~*{9DI*KKYnyDQsPq)%8+py4>5f z+V+kq(kb8lcB`tsy;(guaUeXCS3m$IfKTH*5!gSMEjR&AUr_09OSCH(I87QtL!GBI R2Xk?60;dlUcN}rq`38wYXCwds diff --git a/mysql-test/suite/innodb/t/innodb-mdev-7055.test b/mysql-test/suite/innodb/t/innodb-mdev-7055.test index d68be46c35a..8fd6f86d927 100644 --- a/mysql-test/suite/innodb/t/innodb-mdev-7055.test +++ b/mysql-test/suite/innodb/t/innodb-mdev-7055.test @@ -3,12 +3,13 @@ # 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 +--disable_query_log 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; ---disable_query_log set @@character_set_connection=@old_character_set; +--enable_query_log