diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
| commit | c4ab352b670618bb478138cfbf3ed195317b3ccb (patch) | |
| tree | 3dc86ad7d504865798871ae869ab5bac40e804b2 /mysql-test/suite/innodb_gis | |
| parent | 0a2edddbf4f4737863edf51970cbbaa91e72e11f (diff) | |
| download | mariadb-git-c4ab352b670618bb478138cfbf3ed195317b3ccb.tar.gz | |
MDEV-14576 Include full name of object in message about incorrect value for column.
The error message modified.
Then the TABLE_SHARE::error_table_name() implementation taken from 10.3,
to be used as a name of the table in this message.
Diffstat (limited to 'mysql-test/suite/innodb_gis')
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/1.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_gis/r/gis.result | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/innodb_gis/r/1.result b/mysql-test/suite/innodb_gis/r/1.result index 5728f020918..05662d254e0 100644 --- a/mysql-test/suite/innodb_gis/r/1.result +++ b/mysql-test/suite/innodb_gis/r/1.result @@ -1038,9 +1038,9 @@ SET @a=0x00000000030000000000000000000000000000000000144000000000000014400000000 SET @a=ST_POLYFROMWKB(@a); create table t1(a polygon NOT NULL)engine=InnoDB; insert into t1 values (ST_geomfromtext("point(0 1)")); -ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1 +ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1 insert into t1 values (ST_geomfromtext("point(1 0)")); -ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1 +ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1 select * from (select polygon(t1.a) as p from t1 order by t1.a) d; p drop table t1; diff --git a/mysql-test/suite/innodb_gis/r/gis.result b/mysql-test/suite/innodb_gis/r/gis.result index 4af9d1ff77e..a0729cd1150 100644 --- a/mysql-test/suite/innodb_gis/r/gis.result +++ b/mysql-test/suite/innodb_gis/r/gis.result @@ -1034,9 +1034,9 @@ SET @a=0x00000000030000000000000000000000000000000000144000000000000014400000000 SET @a=ST_POLYFROMWKB(@a); create table t1(a polygon NOT NULL)engine=innodb; insert into t1 values (ST_geomfromtext("point(0 1)")); -ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1 +ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1 insert into t1 values (ST_geomfromtext("point(1 0)")); -ERROR 22007: Incorrect POLYGON value: 'POINT' for column 'a' at row 1 +ERROR 22007: Incorrect POLYGON value: 'POINT' for column `test`.`t1`.`a` at row 1 select * from (select polygon(t1.a) as p from t1 order by t1.a) d; p drop table t1; |