mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

restore shifted error numbers

Browse source
This commit is contained in:
Sergei Golubchik 2010-09-12 14:29:54 +02:00
parent 8da65c05af
commit d5f0c62a05
5 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/parts/r/partition_debug_sync_innodb.result
View file

@ -35,7 +35,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
(PARTITION p0 VALUES LESS THAN (10),
PARTITION p10 VALUES LESS THAN MAXVALUE);
Warnings:
Warning 1649 debug sync point wait timed out
Warning 1639 debug sync point wait timed out
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PARTITION_NAME SUBPARTITION_NAME PARTITION_ORDINAL_POSITION SUBPARTITION_ORDINAL_POSITION PARTITION_METHOD SUBPARTITION_METHOD PARTITION_EXPRESSION SUBPARTITION_EXPRESSION PARTITION_DESCRIPTION TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE CREATE_TIME UPDATE_TIME CHECK_TIME CHECKSUM PARTITION_COMMENT NODEGROUP TABLESPACE_NAME
NULL test t1 p0 NULL 1 NULL RANGE NULL a NULL 10 1 16384 16384 NULL 0 0 NULL NULL NULL NULL default NULL
NULL test t1 p10 NULL 2 NULL RANGE NULL a NULL MAXVALUE 3 5461 16384 NULL 0 0 NULL NULL NULL NULL default NULL

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 t1 values (1,2,3);
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't1' ignored
Warning 1645 The value specified for computed column 'c' in table 't1' ignored
Warning 1647 The value specified for computed column 'b' in table 't1' ignored
Warning 1647 The value specified for computed column 'c' in table 't1' ignored
select * from t1;
a b c
1 -1 -1
@ -65,8 +65,8 @@ a b c
# against vcols
insert into t1 (a,b) values (1,3), (2,4);
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't1' ignored
Warning 1645 The value specified for computed column 'b' in table 't1' ignored
Warning 1647 The value specified for computed column 'b' in table 't1' ignored
Warning 1647 The value specified for computed column 'b' in table 't1' ignored
select * from t1;
a b c
1 -1 -1
@ -107,8 +107,8 @@ a b c
create table t2 like t1;
insert into t2 select * from t1;
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't2' ignored
Warning 1645 The value specified for computed column 'c' in table 't2' ignored
Warning 1647 The value specified for computed column 'b' in table 't2' ignored
Warning 1647 The value specified for computed column 'c' in table 't2' ignored
select * from t1;
a b c
2 -2 -2
@ -123,8 +123,8 @@ a b c
create table t2 like t1;
insert into t2 (a,b) select a,b from t1;
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't2' ignored
Warning 1645 The value specified for computed column 'b' in table 't2' ignored
Warning 1647 The value specified for computed column 'b' in table 't2' ignored
Warning 1647 The value specified for computed column 'b' in table 't2' ignored
select * from t2;
a b c
2 -2 -2
@ -159,7 +159,7 @@ a b c
2 -2 -2
update t1 set c=3 where a=2;
Warnings:
Warning 1645 The value specified for computed column 'c' in table 't1' ignored
Warning 1647 The value specified for computed column 'c' in table 't1' ignored
select * from t1;
a b c
1 -1 -1
@ -189,7 +189,7 @@ a b c
2 -2 -2
update t1 set c=3 where b=-2;
Warnings:
Warning 1645 The value specified for computed column 'c' in table 't1' ignored
Warning 1647 The value specified for computed column 'c' in table 't1' ignored
select * from t1;
a b c
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 t1 values (1,2,3);
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't1' ignored
Warning 1645 The value specified for computed column 'c' in table 't1' ignored
Warning 1647 The value specified for computed column 'b' in table 't1' ignored
Warning 1647 The value specified for computed column 'c' in table 't1' ignored
select * from t1;
a b c
1 -1 -1
@ -65,8 +65,8 @@ a b c
# against vcols
insert into t1 (a,b) values (1,3), (2,4);
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't1' ignored
Warning 1645 The value specified for computed column 'b' in table 't1' ignored
Warning 1647 The value specified for computed column 'b' in table 't1' ignored
Warning 1647 The value specified for computed column 'b' in table 't1' ignored
select * from t1;
a b c
1 -1 -1
@ -107,8 +107,8 @@ a b c
create table t2 like t1;
insert into t2 select * from t1;
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't2' ignored
Warning 1645 The value specified for computed column 'c' in table 't2' ignored
Warning 1647 The value specified for computed column 'b' in table 't2' ignored
Warning 1647 The value specified for computed column 'c' in table 't2' ignored
select * from t1;
a b c
2 -2 -2
@ -123,8 +123,8 @@ a b c
create table t2 like t1;
insert into t2 (a,b) select a,b from t1;
Warnings:
Warning 1645 The value specified for computed column 'b' in table 't2' ignored
Warning 1645 The value specified for computed column 'b' in table 't2' ignored
Warning 1647 The value specified for computed column 'b' in table 't2' ignored
Warning 1647 The value specified for computed column 'b' in table 't2' ignored
select * from t2;
a b c
2 -2 -2
@ -159,7 +159,7 @@ a b c
2 -2 -2
update t1 set c=3 where a=2;
Warnings:
Warning 1645 The value specified for computed column 'c' in table 't1' ignored
Warning 1647 The value specified for computed column 'c' in table 't1' ignored
select * from t1;
a b c
1 -1 -1
@ -189,7 +189,7 @@ a b c
2 -2 -2
update t1 set c=3 where b=-2;
Warnings:
Warning 1645 The value specified for computed column 'c' in table 't1' ignored
Warning 1647 The value specified for computed column 'c' in table 't1' ignored
select * from t1;
a b c
1 -1 -1

4
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);
INSERT INTO t1 VALUES (0,1,0);
Warnings:
Warning 1645 The value specified for computed column 'v' in table 't1' ignored
Warning 1647 The value specified for computed column 'v' in table 't1' ignored
INSERT INTO t1 VALUES (NULL,0,0);
Warnings:
Warning 1645 The value specified for computed column 'v' in table 't1' ignored
Warning 1647 The value specified for computed column 'v' in table 't1' ignored
SELECT a, p, v, ROUND(a,p), ROUND(a,p+NULL) FROM t1;
a p v ROUND(a,p) ROUND(a,p+NULL)
1 0 1 1 NULL

15
sql/share/errmsg.txt
View file

@ -6207,6 +6207,13 @@ ER_TOO_MANY_CONCURRENT_TRXS
WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
eng "Non-ASCII separator arguments are not fully supported"
ER_DEBUG_SYNC_TIMEOUT
eng "debug sync point wait timed out"
ger "Debug Sync Point Wartezeit überschritten"
ER_DEBUG_SYNC_HIT_LIMIT
eng "debug sync point hit limit reached"
ger "Debug Sync Point Hit Limit erreicht"
ER_VCOL_BASED_ON_VCOL
eng "A computed column cannot be based on a computed column"
@ -6236,14 +6243,6 @@ ER_CONST_EXPR_IN_VCOL
ER_ROW_EXPR_FOR_VCOL
eng "Expression for computed column cannot return a row"
ER_DEBUG_SYNC_TIMEOUT
eng "debug sync point wait timed out"
ger "Debug Sync Point Wartezeit überschritten"
ER_DEBUG_SYNC_HIT_LIMIT
eng "debug sync point hit limit reached"
ger "Debug Sync Point Hit Limit erreicht"
ER_UNKNOWN_OPTION
eng "Unknown option '%-.64s'"
ER_BAD_OPTION_VALUE