diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
commit | 45531949ae115f2ba7b9450cc2386653483211ba (patch) | |
tree | 22809f3919c711d5030d2d0e55be969a7bc67e84 /mysql-test/main/subselect_sj_mat.result | |
parent | 36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff) | |
parent | ed13a0d221256028299df4167280e97860ba2edc (diff) | |
download | mariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/subselect_sj_mat.result')
-rw-r--r-- | mysql-test/main/subselect_sj_mat.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result index 76dae42d9c0..85c314e5fde 100644 --- a/mysql-test/main/subselect_sj_mat.result +++ b/mysql-test/main/subselect_sj_mat.result @@ -1704,8 +1704,8 @@ DROP TABLE t1,t2,t3,t4,t5; CREATE TABLE t2 (a int); INSERT IGNORE INTO t2 VALUES ('a'),('a'); Warnings: -Warning 1366 Incorrect integer value: 'a' for column 'a' at row 1 -Warning 1366 Incorrect integer value: 'a' for column 'a' at row 2 +Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 1 +Warning 1366 Incorrect integer value: 'a' for column `test`.`t2`.`a` at row 2 CREATE TABLE t4 (a varchar(1)); INSERT INTO t4 VALUES ('m'),('o'); CREATE TABLE t3 (a varchar(1) , b varchar(1) ) ; |