Skip to content

M
mariadb
Commit 47c1ce35 authored by Gleb Shchepa's avatar Gleb Shchepa
Browse files
Options

manual merge (WL6219)

parents 5a2ae8f4 ba966cff
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 1 deletion
mysql-test/r/ctype_binary.result
View file @ 47c1ce35
...@@ -2038,6 +2038,8 @@ hex(concat(a)) a ...@@ -2038,6 +2038,8 @@ hex(concat(a)) a
30303030303030303030303030303031303030302E31 00000000000000010000.1 30303030303030303030303030303031303030302E31 00000000000000010000.1
drop table t1; drop table t1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
select hex(concat(a)) from t1; select hex(concat(a)) from t1;
hex(concat(a)) hex(concat(a))
...@@ -2351,6 +2353,8 @@ hex(a) ...@@ -2351,6 +2353,8 @@ hex(a)
drop table t1; drop table t1;
drop view v1; drop view v1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
create view v1(a) as select concat(a) from t1; create view v1(a) as select concat(a) from t1;
show columns from v1; show columns from v1;
......
mysql-test/r/ctype_cp1251.result
View file @ 47c1ce35
...@@ -2430,6 +2430,8 @@ hex(concat(a)) a ...@@ -2430,6 +2430,8 @@ hex(concat(a)) a
30303030303030303030303030303031303030302E31 00000000000000010000.1 30303030303030303030303030303031303030302E31 00000000000000010000.1
drop table t1; drop table t1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
select hex(concat(a)) from t1; select hex(concat(a)) from t1;
hex(concat(a)) hex(concat(a))
...@@ -2743,6 +2745,8 @@ hex(a) ...@@ -2743,6 +2745,8 @@ hex(a)
drop table t1; drop table t1;
drop view v1; drop view v1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
create view v1(a) as select concat(a) from t1; create view v1(a) as select concat(a) from t1;
show columns from v1; show columns from v1;
......
mysql-test/r/ctype_latin1.result
View file @ 47c1ce35
...@@ -2457,6 +2457,8 @@ hex(concat(a)) a ...@@ -2457,6 +2457,8 @@ hex(concat(a)) a
30303030303030303030303030303031303030302E31 00000000000000010000.1 30303030303030303030303030303031303030302E31 00000000000000010000.1
drop table t1; drop table t1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
select hex(concat(a)) from t1; select hex(concat(a)) from t1;
hex(concat(a)) hex(concat(a))
...@@ -2770,6 +2772,8 @@ hex(a) ...@@ -2770,6 +2772,8 @@ hex(a)
drop table t1; drop table t1;
drop view v1; drop view v1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
create view v1(a) as select concat(a) from t1; create view v1(a) as select concat(a) from t1;
show columns from v1; show columns from v1;
......
mysql-test/r/ctype_ucs.result
View file @ 47c1ce35
...@@ -3291,6 +3291,8 @@ hex(concat(a)) a ...@@ -3291,6 +3291,8 @@ hex(concat(a)) a
00300030003000300030003000300030003000300030003000300030003000310030003000300030002E0031 00000000000000010000.1 00300030003000300030003000300030003000300030003000300030003000310030003000300030002E0031 00000000000000010000.1
drop table t1; drop table t1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
select hex(concat(a)) from t1; select hex(concat(a)) from t1;
hex(concat(a)) hex(concat(a))
...@@ -3604,6 +3606,8 @@ hex(a) ...@@ -3604,6 +3606,8 @@ hex(a)
drop table t1; drop table t1;
drop view v1; drop view v1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
create view v1(a) as select concat(a) from t1; create view v1(a) as select concat(a) from t1;
show columns from v1; show columns from v1;
......
mysql-test/r/ctype_utf8.result
View file @ 47c1ce35
...@@ -4193,6 +4193,8 @@ hex(concat(a)) a ...@@ -4193,6 +4193,8 @@ hex(concat(a)) a
30303030303030303030303030303031303030302E31 00000000000000010000.1 30303030303030303030303030303031303030302E31 00000000000000010000.1
drop table t1; drop table t1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
select hex(concat(a)) from t1; select hex(concat(a)) from t1;
hex(concat(a)) hex(concat(a))
...@@ -4506,6 +4508,8 @@ hex(a) ...@@ -4506,6 +4508,8 @@ hex(a)
drop table t1; drop table t1;
drop view v1; drop view v1;
create table t1 (a year(2)); create table t1 (a year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (1); insert into t1 values (1);
create view v1(a) as select concat(a) from t1; create view v1(a) as select concat(a) from t1;
show columns from v1; show columns from v1;
......
mysql-test/r/func_group.result
View file @ 47c1ce35
...@@ -1524,6 +1524,8 @@ DROP TABLE t1; ...@@ -1524,6 +1524,8 @@ DROP TABLE t1;
# Bug#43668: Wrong comparison and MIN/MAX for YEAR(2) # Bug#43668: Wrong comparison and MIN/MAX for YEAR(2)
# #
create table t1 (f1 year(2), f2 year(4), f3 date, f4 datetime); create table t1 (f1 year(2), f2 year(4), f3 date, f4 datetime);
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values insert into t1 values
(98,1998,19980101,"1998-01-01 00:00:00"), (98,1998,19980101,"1998-01-01 00:00:00"),
(00,2000,20000101,"2000-01-01 00:00:01"), (00,2000,20000101,"2000-01-01 00:00:01"),
......
mysql-test/r/type_blob.result
View file @ 47c1ce35
...@@ -878,6 +878,8 @@ ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT ...@@ -878,6 +878,8 @@ ERROR 42000: Column length too big for column 'a' (max = 255); use BLOB or TEXT
CREATE TABLE b15776 (a char(4294967296)); CREATE TABLE b15776 (a char(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295) ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a year(4294967295)); CREATE TABLE b15776 (a year(4294967295));
Warnings:
Note 1287 'YEAR(4294967295)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
INSERT INTO b15776 VALUES (42); INSERT INTO b15776 VALUES (42);
SELECT * FROM b15776; SELECT * FROM b15776;
a a
...@@ -886,6 +888,8 @@ DROP TABLE b15776; ...@@ -886,6 +888,8 @@ DROP TABLE b15776;
CREATE TABLE b15776 (a year(4294967296)); CREATE TABLE b15776 (a year(4294967296));
ERROR 42000: Display width out of range for column 'a' (max = 4294967295) ERROR 42000: Display width out of range for column 'a' (max = 4294967295)
CREATE TABLE b15776 (a year(0)); CREATE TABLE b15776 (a year(0));
Warnings:
Note 1287 'YEAR(0)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
DROP TABLE b15776; DROP TABLE b15776;
CREATE TABLE b15776 (a year(-2)); CREATE TABLE b15776 (a year(-2));
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2))' at line 1 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-2))' at line 1
......
mysql-test/r/type_year.result
View file @ 47c1ce35
drop table if exists t1; drop table if exists t1;
create table t1 (y year,y2 year(2)); create table t1 (y year,y2 year(2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
insert into t1 values (0,0),(1999,1999),(2000,2000),(2001,2001),(70,70),(69,69); insert into t1 values (0,0),(1999,1999),(2000,2000),(2001,2001),(70,70),(69,69);
select * from t1; select * from t1;
y y2 y y2
...@@ -50,6 +52,8 @@ End of 5.0 tests ...@@ -50,6 +52,8 @@ End of 5.0 tests
# Bug #49480: WHERE using YEAR columns returns unexpected results # Bug #49480: WHERE using YEAR columns returns unexpected results
# #
CREATE TABLE t2(yy YEAR(2), c2 CHAR(4)); CREATE TABLE t2(yy YEAR(2), c2 CHAR(4));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
CREATE TABLE t4(yyyy YEAR(4), c4 CHAR(4)); CREATE TABLE t4(yyyy YEAR(4), c4 CHAR(4));
INSERT INTO t2 (c2) VALUES (NULL),(1970),(1999),(2000),(2001),(2069); INSERT INTO t2 (c2) VALUES (NULL),(1970),(1999),(2000),(2001),(2069);
INSERT INTO t4 (c4) SELECT c2 FROM t2; INSERT INTO t4 (c4) SELECT c2 FROM t2;
...@@ -355,4 +359,15 @@ total_rows min_value MAX(c1) ...@@ -355,4 +359,15 @@ total_rows min_value MAX(c1)
3 0 2155 3 0 2155
DROP TABLE t1; DROP TABLE t1;
# #
# WL#6219: Deprecate and remove YEAR(2) type
#
CREATE TABLE t1 (c1 YEAR(2), c2 YEAR(4));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
ALTER TABLE t1 MODIFY COLUMN c2 YEAR(2);
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
DROP TABLE t1;
#
End of 5.1 tests End of 5.1 tests
mysql-test/suite/engines/iuds/r/delete_year.result
View file @ 47c1ce35
...@@ -2,7 +2,13 @@ DROP TABLE IF EXISTS t1,t2,t3,t4; ...@@ -2,7 +2,13 @@ DROP TABLE IF EXISTS t1,t2,t3,t4;
CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1)); CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2)); CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1)); CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2)); CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
......
mysql-test/suite/engines/iuds/r/insert_year.result
View file @ 47c1ce35
...@@ -3235,9 +3235,21 @@ c1 c2 c3 c4 ...@@ -3235,9 +3235,21 @@ c1 c2 c3 c4
1999 1999 1998-12-30 1998-12-30 11:30:45 1999 1999 1998-12-30 1998-12-30 11:30:45
DROP TABLE t1,t2,t3,t4; DROP TABLE t1,t2,t3,t4;
CREATE TABLE t1(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2)); CREATE TABLE t1(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
CREATE TABLE t2(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2)); CREATE TABLE t2(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
CREATE TABLE t3(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2)); CREATE TABLE t3(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
CREATE TABLE t4(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME); CREATE TABLE t4(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME);
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
INSERT INTO t1 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45'); INSERT INTO t1 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45');
INSERT INTO t2 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45'); INSERT INTO t2 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45');
INSERT INTO t3 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45'); INSERT INTO t3 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45');
......
mysql-test/suite/engines/iuds/r/update_year.result
View file @ 47c1ce35
...@@ -2,7 +2,13 @@ DROP TABLE IF EXISTS t1,t2,t3,t4; ...@@ -2,7 +2,13 @@ DROP TABLE IF EXISTS t1,t2,t3,t4;
CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1)); CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2)); CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1)); CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2)); CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2));
Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155); INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
......
mysql-test/suite/funcs_1/r/innodb_views.result
View file @ 47c1ce35
...@@ -53,6 +53,8 @@ f107 year(4) not null default 2000, ...@@ -53,6 +53,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt'
into table tb2; into table tb2;
DROP DATABASE IF EXISTS test1; DROP DATABASE IF EXISTS test1;
...@@ -112,6 +114,8 @@ f107 year(4) not null default 2000, ...@@ -112,6 +114,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt'
into table tb2; into table tb2;
USE test; USE test;
......
mysql-test/suite/funcs_1/r/is_columns_innodb.result
View file @ 47c1ce35
...@@ -132,6 +132,8 @@ f107 year(4) not null default 2000, ...@@ -132,6 +132,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt'
into table tb2; into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
...@@ -262,6 +264,8 @@ f239 varchar(20000) binary, ...@@ -262,6 +264,8 @@ f239 varchar(20000) binary,
f240 varchar(2000), f240 varchar(2000),
f241 char(100) f241 char(100)
) engine = innodb; ) engine = innodb;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb4.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb4.txt'
into table tb4; into table tb4;
USE test1; USE test1;
...@@ -319,6 +323,8 @@ f107 year(4) not null default 2000, ...@@ -319,6 +323,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = innodb;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/innodb_tb2.txt'
into table tb2; into table tb2;
USE test; USE test;
......
mysql-test/suite/funcs_1/r/is_columns_memory.result
View file @ 47c1ce35
...@@ -128,6 +128,8 @@ f107 year(4) not null default 2000, ...@@ -128,6 +128,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt'
into table tb2 ; into table tb2 ;
drop table if exists tb3; drop table if exists tb3;
...@@ -251,6 +253,8 @@ f238 varchar(25000) binary, ...@@ -251,6 +253,8 @@ f238 varchar(25000) binary,
f239 varbinary(0), f239 varbinary(0),
f240 varchar(1200) f240 varchar(1200)
) engine = memory; ) engine = memory;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb4.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb4.txt'
into table tb4; into table tb4;
USE test1; USE test1;
...@@ -308,6 +312,8 @@ f107 year(4) not null default 2000, ...@@ -308,6 +312,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt'
into table tb2 ; into table tb2 ;
USE test; USE test;
......
mysql-test/suite/funcs_1/r/is_columns_myisam.result
View file @ 47c1ce35
...@@ -144,6 +144,8 @@ f115 VARBINARY(27) null , ...@@ -144,6 +144,8 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
into table tb2; into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
...@@ -283,6 +285,8 @@ f240 varchar(120), ...@@ -283,6 +285,8 @@ f240 varchar(120),
f241 char(100), f241 char(100),
f242 bit(30) f242 bit(30)
) engine = myisam; ) engine = myisam;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb4.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb4.txt'
into table tb4; into table tb4;
USE test1; USE test1;
...@@ -348,6 +352,8 @@ f115 VARBINARY(27) null , ...@@ -348,6 +352,8 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
into table tb2; into table tb2;
USE test; USE test;
......
mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
View file @ 47c1ce35
...@@ -144,6 +144,8 @@ f115 VARBINARY(27) null , ...@@ -144,6 +144,8 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
into table tb2; into table tb2;
drop table if exists tb3 ; drop table if exists tb3 ;
...@@ -283,6 +285,8 @@ f240 varchar(120), ...@@ -283,6 +285,8 @@ f240 varchar(120),
f241 char(100), f241 char(100),
f242 bit(30) f242 bit(30)
) engine = myisam; ) engine = myisam;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb4.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb4.txt'
into table tb4; into table tb4;
USE test1; USE test1;
...@@ -348,6 +352,8 @@ f115 VARBINARY(27) null , ...@@ -348,6 +352,8 @@ f115 VARBINARY(27) null ,
f116 VARBINARY(64) null, f116 VARBINARY(64) null,
f117 VARBINARY(192) null f117 VARBINARY(192) null
) engine = myisam; ) engine = myisam;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/myisam_tb2.txt'
into table tb2; into table tb2;
USE test; USE test;
......
mysql-test/suite/funcs_1/r/memory_views.result
View file @ 47c1ce35
...@@ -54,6 +54,8 @@ f107 year(4) not null default 2000, ...@@ -54,6 +54,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt'
into table tb2 ; into table tb2 ;
DROP DATABASE IF EXISTS test1; DROP DATABASE IF EXISTS test1;
...@@ -113,6 +115,8 @@ f107 year(4) not null default 2000, ...@@ -113,6 +115,8 @@ f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = memory; ) engine = memory;
Warnings:
Note 1287 'YEAR(3)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt' load data infile '<MYSQLTEST_VARDIR>/std_data/funcs_1/memory_tb2.txt'
into table tb2 ; into table tb2 ;
USE test; USE test;
......
mysql-test/suite/innodb/r/innodb_bug52745.result
View file @ 47c1ce35
...@@ -58,6 +58,7 @@ col89 float unsigned zerofill DEFAULT NULL, ...@@ -58,6 +58,7 @@ col89 float unsigned zerofill DEFAULT NULL,
col90 tinyblob col90 tinyblob
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1; ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
Warnings: Warnings:
Note 1287 'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
Note 1291 Column 'col82' has duplicated value '' in ENUM Note 1291 Column 'col82' has duplicated value '' in ENUM
Note 1291 Column 'col82' has duplicated value '' in ENUM Note 1291 Column 'col82' has duplicated value '' in ENUM
INSERT INTO bug52745 SET INSERT INTO bug52745 SET
......
mysql-test/t/type_year.test
View file @ 47c1ce35
...@@ -159,6 +159,14 @@ SELECT * FROM t1; ...@@ -159,6 +159,14 @@ SELECT * FROM t1;
SELECT COUNT(*) AS total_rows, MIN(c1) AS min_value, MAX(c1) FROM t1; SELECT COUNT(*) AS total_rows, MIN(c1) AS min_value, MAX(c1) FROM t1;
DROP TABLE t1; DROP TABLE t1;
--echo #
--echo # WL#6219: Deprecate and remove YEAR(2) type
--echo #
CREATE TABLE t1 (c1 YEAR(2), c2 YEAR(4));
ALTER TABLE t1 MODIFY COLUMN c2 YEAR(2);
DROP TABLE t1;
--echo # --echo #
--echo End of 5.1 tests --echo End of 5.1 tests
sql/field.cc
View file @ 47c1ce35
...@@ -9929,6 +9929,17 @@ Create_field::Create_field(Field *old_field,Field *orig_field) ...@@ -9929,6 +9929,17 @@ Create_field::Create_field(Field *old_field,Field *orig_field)
geom_type= ((Field_geom*)old_field)->geom_type; geom_type= ((Field_geom*)old_field)->geom_type;
break; break;
#endif #endif
case MYSQL_TYPE_YEAR:
if (length != 4)
{
char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_WARN_DEPRECATED_SYNTAX,
ER(ER_WARN_DEPRECATED_SYNTAX),
buff, "YEAR(4)");
}
break;
default: default:
break; break;
} }
......
sql/sql_yacc.yy
View file @ 47c1ce35
...@@ -5465,7 +5465,23 @@ type: ...@@ -5465,7 +5465,23 @@ type:
$$= MYSQL_TYPE_VARCHAR; $$= MYSQL_TYPE_VARCHAR;
} }
| YEAR_SYM opt_field_length field_options | YEAR_SYM opt_field_length field_options
{ $$=MYSQL_TYPE_YEAR; } {
if (Lex->length)
{
errno= 0;
ulong length= strtoul(Lex->length, NULL, 10);
if (errno == 0 && length <= MAX_FIELD_BLOBLENGTH && length != 4)
{
char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE,
ER_WARN_DEPRECATED_SYNTAX,
ER(ER_WARN_DEPRECATED_SYNTAX),
buff, "YEAR(4)");
}
}
$$=MYSQL_TYPE_YEAR;
}
| DATE_SYM | DATE_SYM
{ $$=MYSQL_TYPE_DATE; } { $$=MYSQL_TYPE_DATE; }
| TIME_SYM | TIME_SYM
......
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