diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-12 14:29:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-12 14:29:54 +0200 |
| commit | d5f0c62a05357652312cc3bf2b17e9f832e6bee8 (patch) | |
| tree | 98eb0b3570fb8760d4602f6ac64dac0ae6745781 /mysql-test/suite/vcol | |
| parent | 8da65c05af52016a58e99271540be4a47a716af9 (diff) | |
| download | mariadb-git-d5f0c62a05357652312cc3bf2b17e9f832e6bee8.tar.gz | |
restore shifted error numbers
Diffstat (limited to 'mysql-test/suite/vcol')
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result | 20 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result | 20 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_misc.result | 4 |
3 files changed, 22 insertions, 22 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result index b996a0108e3..a2ebc7a8cd8 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result @@ -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 diff --git a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result index fa636597536..161a82171ce 100644 --- a/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result @@ -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 diff --git a/mysql-test/suite/vcol/r/vcol_misc.result b/mysql-test/suite/vcol/r/vcol_misc.result index dee34cb4860..e83a89c44c3 100644 --- a/mysql-test/suite/vcol/r/vcol_misc.result +++ b/mysql-test/suite/vcol/r/vcol_misc.result @@ -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 |