summaryrefslogtreecommitdiff
path: root/mysql-test/suite/archive
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2022-08-02 16:23:08 +0400
committerAlexander Barkov <bar@mariadb.com>2022-08-05 22:23:40 +0400
commit3ebbfd88a0360938e3a5a480265beb2a71b1268a (patch)
tree2168fd64b64e21aa391746019414055b326fb0b8 /mysql-test/suite/archive
parent97d16c7544c40430facda441dab89fa4b23468a0 (diff)
downloadmariadb-git-3ebbfd88a0360938e3a5a480265beb2a71b1268a.tar.gz
MDEV-29159 Patch for MDEV-28918 introduces more inconsistency than it solves, breaks usability
1. Store assignment failures on incompatible data types now raise errors if: - STRICT_ALL_TABLES or STRICT_TRANS_TABLES sql_mode is used, and - IGNORE is not used Otherwise, only a warning is raised and the statement continues. 2. Changing the error/warning test as follows: -ERROR HY000: Illegal parameter data types inet6 and int for operation 'SET' +ERROR HY000: Cannot cast 'int' as 'inet6' in assignment of `db`.`t`.`col` so in case of a big table it's easier to see which column has the problem. The new error text is also applied to SP variables.
Diffstat (limited to 'mysql-test/suite/archive')
-rw-r--r--mysql-test/suite/archive/archive_gis.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/archive/archive_gis.result b/mysql-test/suite/archive/archive_gis.result
index 25854db1feb..527a6daeee8 100644
--- a/mysql-test/suite/archive/archive_gis.result
+++ b/mysql-test/suite/archive/archive_gis.result
@@ -452,9 +452,9 @@ ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
drop table t1;
create table t1 (pk integer primary key auto_increment, fl geometry not null);
insert into t1 (fl) values (1);
-ERROR HY000: Illegal parameter data types geometry and int for operation 'SET'
+ERROR HY000: Cannot cast 'int' as 'geometry' in assignment of `test`.`t1`.`fl`
insert into t1 (fl) values (1.11);
-ERROR HY000: Illegal parameter data types geometry and decimal for operation 'SET'
+ERROR HY000: Cannot cast 'decimal' as 'geometry' in assignment of `test`.`t1`.`fl`
insert into t1 (fl) values ("qwerty");
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
insert into t1 (fl) values (pointfromtext('point(1,1)'));