diff options
| -rw-r--r-- | mysql-test/r/gis.result | 15 | ||||
| -rw-r--r-- | mysql-test/t/gis.test | 6 | ||||
| -rw-r--r-- | sql/sql_type.cc | 2 |
3 files changed, 15 insertions, 8 deletions
diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 7f620e67b0e..601590c88c1 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -2199,8 +2199,11 @@ c 1 DROP TABLE t1; # +# Start of 10.3 tests # # +# MDEV-11478 Result data type aggregation for pluggable data types +# CREATE PROCEDURE p2(query TEXT) BEGIN DECLARE errcount INT DEFAULT 0; @@ -2451,23 +2454,23 @@ CREATE TABLE t1 (a SMALLINT, b Point) CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1 ERROR: -Illegal parameter data types shortint and geometry for operation 'case' +Illegal parameter data types smallint and geometry for operation 'case' CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1 ERROR: -Illegal parameter data types shortint and geometry for operation 'coalesce' +Illegal parameter data types smallint and geometry for operation 'coalesce' CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1 ERROR: -Illegal parameter data types shortint and geometry for operation 'if' +Illegal parameter data types smallint and geometry for operation 'if' CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1 ERROR: -Illegal parameter data types shortint and geometry for operation 'ifnull' +Illegal parameter data types smallint and geometry for operation 'ifnull' CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1 ERROR: -Illegal parameter data types shortint and geometry for operation 'UNION' +Illegal parameter data types smallint and geometry for operation 'UNION' ------------------------------------- CREATE TABLE t1 (a MEDIUMINT, b Point) @@ -2811,5 +2814,5 @@ DROP TABLE t1; DROP PROCEDURE p1; DROP PROCEDURE p2; # -# End of 10.2 tests +# End of 10.3 tests # diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index b11fe18ec6d..282005da624 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -1717,7 +1717,11 @@ SELECT c FROM t1; DROP TABLE t1; --echo # +--echo # Start of 10.3 tests --echo # + +--echo # +--echo # MDEV-11478 Result data type aggregation for pluggable data types --echo # DELIMITER $$; @@ -1796,5 +1800,5 @@ DROP PROCEDURE p2; --echo # ---echo # End of 10.2 tests +--echo # End of 10.3 tests --echo # diff --git a/sql/sql_type.cc b/sql/sql_type.cc index 6f20a6c17b6..acd8cf99b0f 100644 --- a/sql/sql_type.cc +++ b/sql/sql_type.cc @@ -200,7 +200,7 @@ const Name const Name Type_handler_tiny::m_name_tiny(C_STRING_WITH_LEN("tinyint")), - Type_handler_short::m_name_short(C_STRING_WITH_LEN("shortint")), + Type_handler_short::m_name_short(C_STRING_WITH_LEN("smallint")), Type_handler_long::m_name_int(C_STRING_WITH_LEN("int")), Type_handler_longlong::m_name_longlong(C_STRING_WITH_LEN("bigint")), Type_handler_int24::m_name_mediumint(C_STRING_WITH_LEN("mediumint")), |