summaryrefslogtreecommitdiff
path: root/mysql-test/main/innodb_icp.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 11:33:53 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-18 11:33:53 +0200
commitb5763ecd01ca9155ecce7b2f06e8a8bfce050ff9 (patch)
treeb0ce48cd6f43a11d7465312dfe14552a8e4f8e3b /mysql-test/main/innodb_icp.result
parent375256bae71e3f20d4498990610842b2976b6187 (diff)
parent45531949ae115f2ba7b9450cc2386653483211ba (diff)
downloadmariadb-git-b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/innodb_icp.result')
-rw-r--r--mysql-test/main/innodb_icp.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/innodb_icp.result b/mysql-test/main/innodb_icp.result
index 8a9106b8e45..00ca6b144ad 100644
--- a/mysql-test/main/innodb_icp.result
+++ b/mysql-test/main/innodb_icp.result
@@ -851,7 +851,7 @@ DROP TABLE t1;
create table t1 (a int,b char(5),primary key (a), key (b(1)));
insert ignore into t1 values ('a','b');
Warnings:
-Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1
+Warning 1366 Incorrect integer value: 'a' for column `test`.`t1`.`a` at row 1
select 1 from t1 where a and b >= 'aa';
1
drop table t1;