Skip to content

M
MariaDB
Commit 90f06818 authored by Alexander Barkov's avatar Alexander Barkov
Browse files
Options

MDEV-12876 Wrong data type for CREATE..SELECT sp_var

parent 62b62319
Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 308 deletions
mysql-test/r/sp-anchor-row-type-cursor.result
View file @ 90f06818
......@@ -85,7 +85,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......@@ -114,7 +114,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......@@ -142,7 +142,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......@@ -171,7 +171,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......
mysql-test/r/sp-anchor-row-type-table.result
View file @ 90f06818
......@@ -36,7 +36,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......@@ -60,7 +60,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......@@ -85,7 +85,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......@@ -111,7 +111,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE `t2` (
`rec.a` bigint(11) DEFAULT NULL,
`rec.a` int(11) DEFAULT NULL,
`rec.b` varchar(10) DEFAULT NULL,
`rec.c` double DEFAULT NULL,
`rec.d` decimal(10,0) DEFAULT NULL
......
mysql-test/r/sp-row.result
View file @ 90f06818
......@@ -755,8 +755,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -765,8 +765,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -775,8 +775,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -785,8 +785,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -795,8 +795,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -805,8 +805,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -815,8 +815,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -825,8 +825,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -835,8 +835,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -845,8 +845,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -855,8 +855,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -865,8 +865,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` int(11) DEFAULT NULL,
`rec.var` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -875,8 +875,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(12) DEFAULT NULL,
`rec.var` bigint(12) DEFAULT NULL
`var` int(12) DEFAULT NULL,
`rec.var` int(12) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -885,8 +885,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(13) DEFAULT NULL,
`rec.var` bigint(13) DEFAULT NULL
`var` int(13) DEFAULT NULL,
`rec.var` int(13) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -895,8 +895,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(14) DEFAULT NULL,
`rec.var` bigint(14) DEFAULT NULL
`var` int(14) DEFAULT NULL,
`rec.var` int(14) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -905,8 +905,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(20) DEFAULT NULL,
`rec.var` bigint(20) DEFAULT NULL
`var` int(20) DEFAULT NULL,
`rec.var` int(20) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -915,8 +915,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(21) DEFAULT NULL,
`rec.var` bigint(21) DEFAULT NULL
`var` int(21) DEFAULT NULL,
`rec.var` int(21) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -928,8 +928,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(4) DEFAULT NULL,
`rec.var` int(4) DEFAULT NULL
`var` tinyint(4) DEFAULT NULL,
`rec.var` tinyint(4) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -938,8 +938,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(4) DEFAULT NULL,
`rec.var` int(4) DEFAULT NULL
`var` tinyint(4) DEFAULT NULL,
`rec.var` tinyint(4) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -948,8 +948,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(4) DEFAULT NULL,
`rec.var` int(4) DEFAULT NULL
`var` tinyint(4) DEFAULT NULL,
`rec.var` tinyint(4) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -958,8 +958,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(4) DEFAULT NULL,
`rec.var` int(4) DEFAULT NULL
`var` tinyint(4) DEFAULT NULL,
`rec.var` tinyint(4) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -968,8 +968,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(4) DEFAULT NULL,
`rec.var` int(4) DEFAULT NULL
`var` tinyint(4) DEFAULT NULL,
`rec.var` tinyint(4) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -978,8 +978,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(5) DEFAULT NULL,
`rec.var` int(5) DEFAULT NULL
`var` tinyint(5) DEFAULT NULL,
`rec.var` tinyint(5) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -988,8 +988,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` tinyint(6) DEFAULT NULL,
`rec.var` tinyint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -998,8 +998,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(7) DEFAULT NULL,
`rec.var` int(7) DEFAULT NULL
`var` tinyint(7) DEFAULT NULL,
`rec.var` tinyint(7) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1008,8 +1008,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(8) DEFAULT NULL,
`rec.var` int(8) DEFAULT NULL
`var` tinyint(8) DEFAULT NULL,
`rec.var` tinyint(8) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1018,8 +1018,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` tinyint(9) DEFAULT NULL,
`rec.var` tinyint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1028,8 +1028,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(10) DEFAULT NULL,
`rec.var` bigint(10) DEFAULT NULL
`var` tinyint(10) DEFAULT NULL,
`rec.var` tinyint(10) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1038,8 +1038,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` tinyint(11) DEFAULT NULL,
`rec.var` tinyint(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1048,8 +1048,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(12) DEFAULT NULL,
`rec.var` bigint(12) DEFAULT NULL
`var` tinyint(12) DEFAULT NULL,
`rec.var` tinyint(12) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1058,8 +1058,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(13) DEFAULT NULL,
`rec.var` bigint(13) DEFAULT NULL
`var` tinyint(13) DEFAULT NULL,
`rec.var` tinyint(13) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1068,8 +1068,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(14) DEFAULT NULL,
`rec.var` bigint(14) DEFAULT NULL
`var` tinyint(14) DEFAULT NULL,
`rec.var` tinyint(14) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1078,8 +1078,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(20) DEFAULT NULL,
`rec.var` bigint(20) DEFAULT NULL
`var` tinyint(20) DEFAULT NULL,
`rec.var` tinyint(20) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1088,8 +1088,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(21) DEFAULT NULL,
`rec.var` bigint(21) DEFAULT NULL
`var` tinyint(21) DEFAULT NULL,
`rec.var` tinyint(21) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1101,8 +1101,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1111,8 +1111,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1121,8 +1121,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1131,8 +1131,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1141,8 +1141,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1151,8 +1151,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1161,8 +1161,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(6) DEFAULT NULL,
`rec.var` int(6) DEFAULT NULL
`var` smallint(6) DEFAULT NULL,
`rec.var` smallint(6) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1171,8 +1171,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(7) DEFAULT NULL,
`rec.var` int(7) DEFAULT NULL
`var` smallint(7) DEFAULT NULL,
`rec.var` smallint(7) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1181,8 +1181,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(8) DEFAULT NULL,
`rec.var` int(8) DEFAULT NULL
`var` smallint(8) DEFAULT NULL,
`rec.var` smallint(8) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1191,8 +1191,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` smallint(9) DEFAULT NULL,
`rec.var` smallint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1201,8 +1201,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(10) DEFAULT NULL,
`rec.var` bigint(10) DEFAULT NULL
`var` smallint(10) DEFAULT NULL,
`rec.var` smallint(10) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1211,8 +1211,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` smallint(11) DEFAULT NULL,
`rec.var` smallint(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1221,8 +1221,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(12) DEFAULT NULL,
`rec.var` bigint(12) DEFAULT NULL
`var` smallint(12) DEFAULT NULL,
`rec.var` smallint(12) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1231,8 +1231,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(13) DEFAULT NULL,
`rec.var` bigint(13) DEFAULT NULL
`var` smallint(13) DEFAULT NULL,
`rec.var` smallint(13) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1241,8 +1241,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(14) DEFAULT NULL,
`rec.var` bigint(14) DEFAULT NULL
`var` smallint(14) DEFAULT NULL,
`rec.var` smallint(14) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1251,8 +1251,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(20) DEFAULT NULL,
`rec.var` bigint(20) DEFAULT NULL
`var` smallint(20) DEFAULT NULL,
`rec.var` smallint(20) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1261,8 +1261,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(21) DEFAULT NULL,
`rec.var` bigint(21) DEFAULT NULL
`var` smallint(21) DEFAULT NULL,
`rec.var` smallint(21) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1274,8 +1274,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1284,8 +1284,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1294,8 +1294,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1304,8 +1304,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1314,8 +1314,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1324,8 +1324,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1334,8 +1334,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1344,8 +1344,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1354,8 +1354,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1364,8 +1364,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` int(9) DEFAULT NULL,
`rec.var` int(9) DEFAULT NULL
`var` mediumint(9) DEFAULT NULL,
`rec.var` mediumint(9) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1374,8 +1374,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(10) DEFAULT NULL,
`rec.var` bigint(10) DEFAULT NULL
`var` mediumint(10) DEFAULT NULL,
`rec.var` mediumint(10) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1384,8 +1384,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(11) DEFAULT NULL,
`rec.var` bigint(11) DEFAULT NULL
`var` mediumint(11) DEFAULT NULL,
`rec.var` mediumint(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1394,8 +1394,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(12) DEFAULT NULL,
`rec.var` bigint(12) DEFAULT NULL
`var` mediumint(12) DEFAULT NULL,
`rec.var` mediumint(12) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1404,8 +1404,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(13) DEFAULT NULL,
`rec.var` bigint(13) DEFAULT NULL
`var` mediumint(13) DEFAULT NULL,
`rec.var` mediumint(13) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1414,8 +1414,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(14) DEFAULT NULL,
`rec.var` bigint(14) DEFAULT NULL
`var` mediumint(14) DEFAULT NULL,
`rec.var` mediumint(14) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1424,8 +1424,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(20) DEFAULT NULL,
`rec.var` bigint(20) DEFAULT NULL
`var` mediumint(20) DEFAULT NULL,
`rec.var` mediumint(20) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1434,8 +1434,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`var` bigint(21) DEFAULT NULL,
`rec.var` bigint(21) DEFAULT NULL
`var` mediumint(21) DEFAULT NULL,
`rec.var` mediumint(21) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
DROP PROCEDURE p1;
......
mysql-test/r/sp-vars.result
View file @ 90f06818
......@@ -1184,3 +1184,40 @@ CALL vctest();
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'string'
DROP PROCEDURE vctest;
#
# Start of 10.3 tests
#
CREATE PROCEDURE p1()
BEGIN
DECLARE i8 TINYINT;
DECLARE i16 SMALLINT;
DECLARE i32 INT;
DECLARE i64 BIGINT;
DECLARE f FLOAT;
DECLARE d DOUBLE;
DECLARE b8 BIT(8);
DECLARE y YEAR;
DECLARE t1 TINYTEXT;
DECLARE t2 TEXT;
DECLARE t3 MEDIUMTEXT;
DECLARE t4 LONGTEXT;
CREATE TABLE t1 AS SELECT i8, i16, i32, i64, f, d, b8, y, t1, t2, t3, t4;
END;
$$
CALL p1;
DESCRIBE t1;
Field Type Null Key Default Extra
i8 tinyint(4) YES NULL
i16 smallint(6) YES NULL
i32 int(11) YES NULL
i64 bigint(20) YES NULL
f float YES NULL
d double YES NULL
b8 bit(8) YES NULL
y year(4) YES NULL
t1 tinytext YES NULL
t2 text YES NULL
t3 mediumtext YES NULL
t4 longtext YES NULL
DROP TABLE t1;
DROP PROCEDURE p1;
mysql-test/r/sp.result
View file @ 90f06818
......@@ -6469,7 +6469,7 @@ CALL p2(10);
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`v` bigint(11) DEFAULT NULL
`v` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
......@@ -6480,7 +6480,7 @@ Warning 1366 Incorrect integer value: 'text' for column 'v' at row 1
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`v` bigint(11) DEFAULT NULL
`v` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
DROP TABLE t1;
......
mysql-test/suite/compat/oracle/r/sp-cursor-rowtype.result
View file @ 90f06818
......@@ -85,7 +85,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......@@ -116,7 +116,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......@@ -146,7 +146,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......@@ -177,7 +177,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......
mysql-test/suite/compat/oracle/r/sp-row.result
View file @ 90f06818
......@@ -832,8 +832,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -842,8 +842,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -852,8 +852,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -862,8 +862,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -872,8 +872,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -882,8 +882,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -892,8 +892,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -902,8 +902,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -912,8 +912,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -922,8 +922,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -932,8 +932,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -942,8 +942,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" int(11) DEFAULT NULL,
"rec.var" int(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -952,8 +952,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(12) DEFAULT NULL,
"rec.var" bigint(12) DEFAULT NULL
"var" int(12) DEFAULT NULL,
"rec.var" int(12) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -962,8 +962,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(13) DEFAULT NULL,
"rec.var" bigint(13) DEFAULT NULL
"var" int(13) DEFAULT NULL,
"rec.var" int(13) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -972,8 +972,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(14) DEFAULT NULL,
"rec.var" bigint(14) DEFAULT NULL
"var" int(14) DEFAULT NULL,
"rec.var" int(14) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -982,8 +982,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(20) DEFAULT NULL,
"rec.var" bigint(20) DEFAULT NULL
"var" int(20) DEFAULT NULL,
"rec.var" int(20) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -992,8 +992,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(21) DEFAULT NULL,
"rec.var" bigint(21) DEFAULT NULL
"var" int(21) DEFAULT NULL,
"rec.var" int(21) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1005,8 +1005,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(4) DEFAULT NULL,
"rec.var" int(4) DEFAULT NULL
"var" tinyint(4) DEFAULT NULL,
"rec.var" tinyint(4) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1015,8 +1015,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(4) DEFAULT NULL,
"rec.var" int(4) DEFAULT NULL
"var" tinyint(4) DEFAULT NULL,
"rec.var" tinyint(4) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1025,8 +1025,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(4) DEFAULT NULL,
"rec.var" int(4) DEFAULT NULL
"var" tinyint(4) DEFAULT NULL,
"rec.var" tinyint(4) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1035,8 +1035,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(4) DEFAULT NULL,
"rec.var" int(4) DEFAULT NULL
"var" tinyint(4) DEFAULT NULL,
"rec.var" tinyint(4) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1045,8 +1045,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(4) DEFAULT NULL,
"rec.var" int(4) DEFAULT NULL
"var" tinyint(4) DEFAULT NULL,
"rec.var" tinyint(4) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1055,8 +1055,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(5) DEFAULT NULL,
"rec.var" int(5) DEFAULT NULL
"var" tinyint(5) DEFAULT NULL,
"rec.var" tinyint(5) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1065,8 +1065,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" tinyint(6) DEFAULT NULL,
"rec.var" tinyint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1075,8 +1075,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(7) DEFAULT NULL,
"rec.var" int(7) DEFAULT NULL
"var" tinyint(7) DEFAULT NULL,
"rec.var" tinyint(7) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1085,8 +1085,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(8) DEFAULT NULL,
"rec.var" int(8) DEFAULT NULL
"var" tinyint(8) DEFAULT NULL,
"rec.var" tinyint(8) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1095,8 +1095,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" tinyint(9) DEFAULT NULL,
"rec.var" tinyint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1105,8 +1105,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(10) DEFAULT NULL,
"rec.var" bigint(10) DEFAULT NULL
"var" tinyint(10) DEFAULT NULL,
"rec.var" tinyint(10) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1115,8 +1115,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" tinyint(11) DEFAULT NULL,
"rec.var" tinyint(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1125,8 +1125,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(12) DEFAULT NULL,
"rec.var" bigint(12) DEFAULT NULL
"var" tinyint(12) DEFAULT NULL,
"rec.var" tinyint(12) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1135,8 +1135,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(13) DEFAULT NULL,
"rec.var" bigint(13) DEFAULT NULL
"var" tinyint(13) DEFAULT NULL,
"rec.var" tinyint(13) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1145,8 +1145,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(14) DEFAULT NULL,
"rec.var" bigint(14) DEFAULT NULL
"var" tinyint(14) DEFAULT NULL,
"rec.var" tinyint(14) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1155,8 +1155,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(20) DEFAULT NULL,
"rec.var" bigint(20) DEFAULT NULL
"var" tinyint(20) DEFAULT NULL,
"rec.var" tinyint(20) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1165,8 +1165,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(21) DEFAULT NULL,
"rec.var" bigint(21) DEFAULT NULL
"var" tinyint(21) DEFAULT NULL,
"rec.var" tinyint(21) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1178,8 +1178,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1188,8 +1188,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1198,8 +1198,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1208,8 +1208,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1218,8 +1218,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1228,8 +1228,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1238,8 +1238,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(6) DEFAULT NULL,
"rec.var" int(6) DEFAULT NULL
"var" smallint(6) DEFAULT NULL,
"rec.var" smallint(6) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1248,8 +1248,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(7) DEFAULT NULL,
"rec.var" int(7) DEFAULT NULL
"var" smallint(7) DEFAULT NULL,
"rec.var" smallint(7) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1258,8 +1258,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(8) DEFAULT NULL,
"rec.var" int(8) DEFAULT NULL
"var" smallint(8) DEFAULT NULL,
"rec.var" smallint(8) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1268,8 +1268,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" smallint(9) DEFAULT NULL,
"rec.var" smallint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1278,8 +1278,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(10) DEFAULT NULL,
"rec.var" bigint(10) DEFAULT NULL
"var" smallint(10) DEFAULT NULL,
"rec.var" smallint(10) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1288,8 +1288,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" smallint(11) DEFAULT NULL,
"rec.var" smallint(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1298,8 +1298,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(12) DEFAULT NULL,
"rec.var" bigint(12) DEFAULT NULL
"var" smallint(12) DEFAULT NULL,
"rec.var" smallint(12) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1308,8 +1308,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(13) DEFAULT NULL,
"rec.var" bigint(13) DEFAULT NULL
"var" smallint(13) DEFAULT NULL,
"rec.var" smallint(13) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1318,8 +1318,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(14) DEFAULT NULL,
"rec.var" bigint(14) DEFAULT NULL
"var" smallint(14) DEFAULT NULL,
"rec.var" smallint(14) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1328,8 +1328,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(20) DEFAULT NULL,
"rec.var" bigint(20) DEFAULT NULL
"var" smallint(20) DEFAULT NULL,
"rec.var" smallint(20) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1338,8 +1338,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(21) DEFAULT NULL,
"rec.var" bigint(21) DEFAULT NULL
"var" smallint(21) DEFAULT NULL,
"rec.var" smallint(21) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1351,8 +1351,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1361,8 +1361,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1371,8 +1371,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1381,8 +1381,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1391,8 +1391,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1401,8 +1401,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1411,8 +1411,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1421,8 +1421,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1431,8 +1431,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1441,8 +1441,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" int(9) DEFAULT NULL,
"rec.var" int(9) DEFAULT NULL
"var" mediumint(9) DEFAULT NULL,
"rec.var" mediumint(9) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1451,8 +1451,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(10) DEFAULT NULL,
"rec.var" bigint(10) DEFAULT NULL
"var" mediumint(10) DEFAULT NULL,
"rec.var" mediumint(10) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1461,8 +1461,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(11) DEFAULT NULL,
"rec.var" bigint(11) DEFAULT NULL
"var" mediumint(11) DEFAULT NULL,
"rec.var" mediumint(11) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1471,8 +1471,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(12) DEFAULT NULL,
"rec.var" bigint(12) DEFAULT NULL
"var" mediumint(12) DEFAULT NULL,
"rec.var" mediumint(12) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1481,8 +1481,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(13) DEFAULT NULL,
"rec.var" bigint(13) DEFAULT NULL
"var" mediumint(13) DEFAULT NULL,
"rec.var" mediumint(13) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1491,8 +1491,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(14) DEFAULT NULL,
"rec.var" bigint(14) DEFAULT NULL
"var" mediumint(14) DEFAULT NULL,
"rec.var" mediumint(14) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1501,8 +1501,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(20) DEFAULT NULL,
"rec.var" bigint(20) DEFAULT NULL
"var" mediumint(20) DEFAULT NULL,
"rec.var" mediumint(20) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -1511,8 +1511,8 @@ CALL p1();
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"var" bigint(21) DEFAULT NULL,
"rec.var" bigint(21) DEFAULT NULL
"var" mediumint(21) DEFAULT NULL,
"rec.var" mediumint(21) DEFAULT NULL
)
DROP TABLE t1;
DROP PROCEDURE p1;
......@@ -2235,7 +2235,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......@@ -2260,7 +2260,7 @@ CREATE TABLE t1 (a INT, b VARCHAR(10), c DOUBLE, d DECIMAL(10));
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......@@ -2286,7 +2286,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......@@ -2313,7 +2313,7 @@ CREATE VIEW v1 AS SELECT * FROM t1;
CALL p1();
Table Create Table
t2 CREATE TABLE "t2" (
"rec.a" bigint(11) DEFAULT NULL,
"rec.a" int(11) DEFAULT NULL,
"rec.b" varchar(10) DEFAULT NULL,
"rec.c" double DEFAULT NULL,
"rec.d" decimal(10,0) DEFAULT NULL
......
mysql-test/t/sp-vars.test
View file @ 90f06818
......@@ -1487,3 +1487,31 @@ DELIMITER ;|
CALL vctest();
DROP PROCEDURE vctest;
--echo #
--echo # Start of 10.3 tests
--echo #
DELIMITER $$;
CREATE PROCEDURE p1()
BEGIN
DECLARE i8 TINYINT;
DECLARE i16 SMALLINT;
DECLARE i32 INT;
DECLARE i64 BIGINT;
DECLARE f FLOAT;
DECLARE d DOUBLE;
DECLARE b8 BIT(8);
DECLARE y YEAR;
DECLARE t1 TINYTEXT;
DECLARE t2 TEXT;
DECLARE t3 MEDIUMTEXT;
DECLARE t4 LONGTEXT;
CREATE TABLE t1 AS SELECT i8, i16, i32, i64, f, d, b8, y, t1, t2, t3, t4;
END;
$$
DELIMITER ;$$
CALL p1;
DESCRIBE t1;
DROP TABLE t1;
DROP PROCEDURE p1;
sql/item.cc
View file @ 90f06818
......@@ -1625,7 +1625,9 @@ Item_splocal::Item_splocal(THD *thd, const LEX_CSTRING *sp_var_name,
bool Item_splocal::fix_fields(THD *thd, Item **ref)
{
return fix_fields_from_item(thd, ref, thd->spcont->get_item(m_var_idx));
Item *item= thd->spcont->get_item(m_var_idx);
set_handler(item->type_handler());
return fix_fields_from_item(thd, ref, item);
}
......
sql/item.h
View file @ 90f06818
......@@ -2281,6 +2281,18 @@ class Item_splocal :public Item_sp_variable,
bool append_for_log(THD *thd, String *str);
Item *get_copy(THD *thd, MEM_ROOT *mem_root) { return 0; }
/*
Override the inherited create_field_for_create_select(),
because we want to preserve the exact data type for:
DECLARE a1 INT;
DECLARE a2 TYPE OF t1.a2;
CREATE TABLE t1 AS SELECT a1, a2;
The inherited implementation would create a column
based on result_type(), which is less exact.
*/
Field *create_field_for_create_select(TABLE *table)
{ return tmp_table_field_from_field_type(table); }
};
......@@ -2312,23 +2324,6 @@ class Item_splocal_with_delayed_data_type: public Item_splocal
:Item_splocal(thd, sp_var_name, sp_var_idx, MYSQL_TYPE_NULL,
pos_in_q, len_in_q)
{ }
bool fix_fields(THD *thd, Item **it)
{
if (Item_splocal::fix_fields(thd, it))
return true;
set_handler(this_item()->type_handler());
return false;
}
/*
Override the inherited create_field_for_create_select(),
because we want to preserve the exact data type for:
DECLARE a t1.a%TYPE;
CREATE TABLE t1 AS SELECT a;
The inherited implementation would create a column
based on result_type(), which is less exact.
*/
Field *create_field_for_create_select(TABLE *table)
{ return tmp_table_field_from_field_type(table); }
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7