Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6af29a76
Commit
6af29a76
authored
Sep 12, 2010
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restore shifted error numbers
parent
ecae3771
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
31 deletions
+30
-31
mysql-test/suite/parts/r/partition_debug_sync_innodb.result
mysql-test/suite/parts/r/partition_debug_sync_innodb.result
+1
-1
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
+10
-10
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
+10
-10
mysql-test/suite/vcol/r/vcol_misc.result
mysql-test/suite/vcol/r/vcol_misc.result
+2
-2
sql/share/errmsg.txt
sql/share/errmsg.txt
+7
-8
No files found.
mysql-test/suite/parts/r/partition_debug_sync_innodb.result
View file @
6af29a76
...
@@ -35,7 +35,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
...
@@ -35,7 +35,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 INTO
(PARTITION p0 VALUES LESS THAN (10),
(PARTITION p0 VALUES LESS THAN (10),
PARTITION p10 VALUES LESS THAN MAXVALUE);
PARTITION p10 VALUES LESS THAN MAXVALUE);
Warnings:
Warnings:
Warning 16
4
9 debug sync point wait timed out
Warning 16
3
9 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
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 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
NULL test t1 p10 NULL 2 NULL RANGE NULL a NULL MAXVALUE 3 5461 16384 NULL 0 0 NULL NULL NULL NULL default NULL
...
...
mysql-test/suite/vcol/r/vcol_ins_upd_innodb.result
View file @
6af29a76
...
@@ -25,8 +25,8 @@ a b c
...
@@ -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 164
5
The value specified for computed column 'b' in table 't1' ignored
Warning 164
7
The value specified for computed column 'b' in table 't1' ignored
Warning 164
5
The value specified for computed column 'c' in table 't1' ignored
Warning 164
7
The value specified for computed column 'c' in table 't1' 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
...
@@ -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 164
5
The value specified for computed column 'b' in table 't1' ignored
Warning 164
7
The value specified for computed column 'b' in table 't1' ignored
Warning 164
5
The value specified for computed column 'b' in table 't1' ignored
Warning 164
7
The value specified for computed column 'b' in table 't1' 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
...
@@ -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 164
5
The value specified for computed column 'b' in table 't2' ignored
Warning 164
7
The value specified for computed column 'b' in table 't2' ignored
Warning 164
5
The value specified for computed column 'c' in table 't2' ignored
Warning 164
7
The value specified for computed column 'c' in table 't2' 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
...
@@ -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 164
5
The value specified for computed column 'b' in table 't2' ignored
Warning 164
7
The value specified for computed column 'b' in table 't2' ignored
Warning 164
5
The value specified for computed column 'b' in table 't2' ignored
Warning 164
7
The value specified for computed column 'b' in table 't2' 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
...
@@ -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 164
5
The value specified for computed column 'c' in table 't1' ignored
Warning 164
7
The value specified for computed column 'c' in table 't1' 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
...
@@ -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 164
5
The value specified for computed column 'c' in table 't1' ignored
Warning 164
7
The value specified for computed column 'c' in table 't1' ignored
select * from t1;
select * from t1;
a b c
a b c
1 -1 -1
1 -1 -1
...
...
mysql-test/suite/vcol/r/vcol_ins_upd_myisam.result
View file @
6af29a76
...
@@ -25,8 +25,8 @@ a b c
...
@@ -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 164
5
The value specified for computed column 'b' in table 't1' ignored
Warning 164
7
The value specified for computed column 'b' in table 't1' ignored
Warning 164
5
The value specified for computed column 'c' in table 't1' ignored
Warning 164
7
The value specified for computed column 'c' in table 't1' 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
...
@@ -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 164
5
The value specified for computed column 'b' in table 't1' ignored
Warning 164
7
The value specified for computed column 'b' in table 't1' ignored
Warning 164
5
The value specified for computed column 'b' in table 't1' ignored
Warning 164
7
The value specified for computed column 'b' in table 't1' 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
...
@@ -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 164
5
The value specified for computed column 'b' in table 't2' ignored
Warning 164
7
The value specified for computed column 'b' in table 't2' ignored
Warning 164
5
The value specified for computed column 'c' in table 't2' ignored
Warning 164
7
The value specified for computed column 'c' in table 't2' 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
...
@@ -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 164
5
The value specified for computed column 'b' in table 't2' ignored
Warning 164
7
The value specified for computed column 'b' in table 't2' ignored
Warning 164
5
The value specified for computed column 'b' in table 't2' ignored
Warning 164
7
The value specified for computed column 'b' in table 't2' 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
...
@@ -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 164
5
The value specified for computed column 'c' in table 't1' ignored
Warning 164
7
The value specified for computed column 'c' in table 't1' 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
...
@@ -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 164
5
The value specified for computed column 'c' in table 't1' ignored
Warning 164
7
The value specified for computed column 'c' in table 't1' ignored
select * from t1;
select * from t1;
a b c
a b c
1 -1 -1
1 -1 -1
...
...
mysql-test/suite/vcol/r/vcol_misc.result
View file @
6af29a76
...
@@ -108,10 +108,10 @@ DROP TABLE t1,t2;
...
@@ -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 164
5
The value specified for computed column 'v' in table 't1' ignored
Warning 164
7
The value specified for computed column 'v' in table 't1' ignored
INSERT INTO t1 VALUES (NULL,0,0);
INSERT INTO t1 VALUES (NULL,0,0);
Warnings:
Warnings:
Warning 164
5
The value specified for computed column 'v' in table 't1' ignored
Warning 164
7
The value specified for computed column 'v' in table 't1' 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
...
...
sql/share/errmsg.txt
View file @
6af29a76
...
@@ -6207,6 +6207,13 @@ ER_TOO_MANY_CONCURRENT_TRXS
...
@@ -6207,6 +6207,13 @@ ER_TOO_MANY_CONCURRENT_TRXS
WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
eng "Non-ASCII separator arguments are not fully supported"
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
ER_VCOL_BASED_ON_VCOL
eng "A computed column cannot be based on a computed column"
eng "A computed column cannot be based on a computed column"
...
@@ -6236,14 +6243,6 @@ ER_CONST_EXPR_IN_VCOL
...
@@ -6236,14 +6243,6 @@ ER_CONST_EXPR_IN_VCOL
ER_ROW_EXPR_FOR_VCOL
ER_ROW_EXPR_FOR_VCOL
eng "Expression for computed column cannot return a row"
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
ER_UNKNOWN_OPTION
eng "Unknown option '%-.64s'"
eng "Unknown option '%-.64s'"
ER_BAD_OPTION_VALUE
ER_BAD_OPTION_VALUE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment