database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for MDEV-17449, typo in error message (#1146)

Browse Source
This commit is contained in:
Chris Calender
2019-03-24 13:24:28 -04:00
committed by Sergey Vojtovich
parent d8b7e76c37
commit c61e8a6597
8 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/suite/storage_engine/vcol.result
View File

@ -7,8 +7,8 @@ b int(11) # # VIRTUAL
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
@ -24,8 +24,8 @@ b int(11) # # PERSISTENT
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
@ -41,8 +41,8 @@ b int(11) # # VIRTUAL
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2
@ -58,8 +58,8 @@ b int(11) # # PERSISTENT
INSERT INTO t1 (a) VALUES (1),(2); INSERT INTO t1 (a) VALUES (1),(2);
INSERT INTO t1 (a,b) VALUES (3,3),(4,4); INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
SELECT a,b FROM t1; SELECT a,b FROM t1;
a b a b
1 2 1 2

20
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
View File

@ -25,8 +25,8 @@ a b c
# INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
insert into t1 values (1,2,3); insert into t1 values (1,2,3);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'c' in table 't1' ignored Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
@ -65,8 +65,8 @@ a b c
# against vcols # against vcols
insert into t1 (a,b) values (1,3), (2,4); insert into t1 (a,b) values (1,3), (2,4);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
@ -107,8 +107,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert into t2 select * from t1; insert into t2 select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
Warning 1906 The value specified for computed column 'c' in table 't2' ignored Warning 1906 The value specified for computed column 'c' in table 't2' has been ignored
select * from t1; select * from t1;
a b c a b c
2 -2 -2 2 -2 -2
@ -123,8 +123,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert into t2 (a,b) select a,b from t1; insert into t2 (a,b) select a,b from t1;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
select * from t2; select * from t2;
a b c a b c
2 -2 -2 2 -2 -2
@ -159,7 +159,7 @@ a b c
2 -2 -2 2 -2 -2
update t1 set c=3 where a=2; update t1 set c=3 where a=2;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'c' in table 't1' ignored Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
@ -189,7 +189,7 @@ a b c
2 -2 -2 2 -2 -2
update t1 set c=3 where b=-2; update t1 set c=3 where b=-2;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'c' in table 't1' ignored Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1

20
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
View File

@ -25,8 +25,8 @@ a b c
# INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols # INSERT INTO tbl_name VALUES... a non-NULL value is specified against vcols
insert into t1 values (1,2,3); insert into t1 values (1,2,3);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'c' in table 't1' ignored Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
@ -65,8 +65,8 @@ a b c
# against vcols # against vcols
insert into t1 (a,b) values (1,3), (2,4); insert into t1 (a,b) values (1,3), (2,4);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't1' ignored Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
@ -107,8 +107,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert into t2 select * from t1; insert into t2 select * from t1;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
Warning 1906 The value specified for computed column 'c' in table 't2' ignored Warning 1906 The value specified for computed column 'c' in table 't2' has been ignored
select * from t1; select * from t1;
a b c a b c
2 -2 -2 2 -2 -2
@ -123,8 +123,8 @@ a b c
create table t2 like t1; create table t2 like t1;
insert into t2 (a,b) select a,b from t1; insert into t2 (a,b) select a,b from t1;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
select * from t2; select * from t2;
a b c a b c
2 -2 -2 2 -2 -2
@ -159,7 +159,7 @@ a b c
2 -2 -2 2 -2 -2
update t1 set c=3 where a=2; update t1 set c=3 where a=2;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'c' in table 't1' ignored Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1
@ -189,7 +189,7 @@ a b c
2 -2 -2 2 -2 -2
update t1 set c=3 where b=-2; update t1 set c=3 where b=-2;
Warnings: Warnings:
Warning 1906 The value specified for computed column 'c' in table 't1' ignored Warning 1906 The value specified for computed column 'c' in table 't1' has been ignored
select * from t1; select * from t1;
a b c a b c
1 -1 -1 1 -1 -1

12
mysql-test/suite/vcol/r/vcol_misc.result
View File

@ -108,10 +108,10 @@ DROP TABLE t1,t2;
CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL); CREATE TABLE t1 (p int, a double NOT NULL, v double AS (ROUND(a,p)) VIRTUAL);
INSERT INTO t1 VALUES (0,1,0); INSERT INTO t1 VALUES (0,1,0);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'v' in table 't1' ignored Warning 1906 The value specified for computed column 'v' in table 't1' has been ignored
INSERT INTO t1 VALUES (NULL,0,0); INSERT INTO t1 VALUES (NULL,0,0);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'v' in table 't1' ignored Warning 1906 The value specified for computed column 'v' in table 't1' has been ignored
SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1; SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
a p v ROUND(a,p) ROUND(a,p+NULL) a p v ROUND(a,p) ROUND(a,p+NULL)
1 0 1 1 NULL 1 0 1 1 NULL
@ -306,15 +306,15 @@ d varchar(5) latin1_swedish_ci YES NULL PERSISTENT #
INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL); INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,NULL);
UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a';
Warnings: Warnings:
Warning 1906 The value specified for computed column 'd' in table 't1' ignored Warning 1906 The value specified for computed column 'd' in table 't1' has been ignored
INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
Warnings: Warnings:
Warning 1906 The value specified for computed column 'd' in table 't1' ignored Warning 1906 The value specified for computed column 'd' in table 't1' has been ignored
set sql_mode='strict_all_tables'; set sql_mode='strict_all_tables';
UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a'; UPDATE `test`.`t1` SET `d`='b' WHERE `a`='1' AND `b`='a' AND `c`='1' AND `d`='a';
ERROR HY000: The value specified for computed column 'd' in table 't1' ignored ERROR HY000: The value specified for computed column 'd' in table 't1' has been ignored
INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a'); INSERT INTO `test`.`t1`(`a`,`b`,`c`,`d`) VALUES ( '1','a',NULL,'a');
ERROR HY000: The value specified for computed column 'd' in table 't1' ignored ERROR HY000: The value specified for computed column 'd' in table 't1' has been ignored
drop table t1; drop table t1;
# #
# MDEV-5611: self-referencing virtual column # MDEV-5611: self-referencing virtual column

6
mysql-test/suite/vcol/r/vcol_select_myisam.result
View File

@ -273,9 +273,9 @@ INSERT INTO t1 VALUES (NULL),( 78), (185), (0), (154);
CREATE TABLE t2 (a int, b int AS (a) VIRTUAL); CREATE TABLE t2 (a int, b int AS (a) VIRTUAL);
INSERT INTO t2 VALUES (187,187), (9,9), (187,187); INSERT INTO t2 VALUES (187,187), (9,9), (187,187);
Warnings: Warnings:
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
Warning 1906 The value specified for computed column 'b' in table 't2' ignored Warning 1906 The value specified for computed column 'b' in table 't2' has been ignored
EXPLAIN EXTENDED EXPLAIN EXTENDED
SELECT * FROM t1 JOIN t2 USING (b); SELECT * FROM t1 JOIN t2 USING (b);
id select_type table type possible_keys key key_len ref rows filtered Extra id select_type table type possible_keys key key_len ref rows filtered Extra

2
sql/share/errmsg-utf8.txt
View File

@ -6511,7 +6511,7 @@ ER_KEY_BASED_ON_GENERATED_VIRTUAL_COLUMN
ER_WRONG_FK_OPTION_FOR_VIRTUAL_COLUMN ER_WRONG_FK_OPTION_FOR_VIRTUAL_COLUMN
eng "Cannot define foreign key with %s clause on a computed column" eng "Cannot define foreign key with %s clause on a computed column"
ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN ER_WARNING_NON_DEFAULT_VALUE_FOR_VIRTUAL_COLUMN
eng "The value specified for computed column '%s' in table '%s' ignored" eng "The value specified for computed column '%s' in table '%s' has been ignored"
ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN ER_UNSUPPORTED_ACTION_ON_VIRTUAL_COLUMN
eng "This is not yet supported for computed columns" eng "This is not yet supported for computed columns"
ER_CONST_EXPR_IN_VCOL ER_CONST_EXPR_IN_VCOL

16
storage/innobase/mysql-test/storage_engine/vcol.rdiff
View File

@ -10,8 +10,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
@ -27,8 +27,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
@ -44,8 +44,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
@ -61,8 +61,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2

16
storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
View File

@ -10,8 +10,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
@ -27,8 +27,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
@ -44,8 +44,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2
@ -61,8 +61,8 @@
-INSERT INTO t1 (a) VALUES (1),(2); -INSERT INTO t1 (a) VALUES (1),(2);
-INSERT INTO t1 (a,b) VALUES (3,3),(4,4); -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
-Warnings: -Warnings:
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-Warning 1906 The value specified for computed column 'b' in table 't1' ignored -Warning 1906 The value specified for computed column 'b' in table 't1' has been ignored
-SELECT a,b FROM t1; -SELECT a,b FROM t1;
-a b -a b
-1 2 -1 2