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

Bug #12097 More fixes

Browse Source 
mysql-test/r/partition_error.result:
  Fixed result files after rearranging code a bit
mysql-test/t/partition_error.test:
  Fixed result files after rearranging code a bit
sql/share/errmsg.txt:
  Fixed result files after rearranging code a bit
sql/sql_yacc.yy:
  Added initialisation
This commit is contained in:
unknown
2005-07-22 15:17:05 -04:00
parent a51a1f088b
commit b6f97cb42c
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/partition_error.result
View File

@ -290,7 +290,8 @@ partition by range (a)
partitions 2 partitions 2
(partition x1 values less than (4.0) tablespace ts1, (partition x1 values less than (4.0) tablespace ts1,
partition x2 values less than (8) tablespace ts2); partition x2 values less than (8) tablespace ts2);
ERROR HY000: VALUES LESS THAN value must be of same type as partition function ERROR 42000: VALUES value must be of same type as partition function near ') tablespace ts1,
partition x2 values less than (8) tablespace ts2)' at line 8
CREATE TABLE t1 ( CREATE TABLE t1 (
a int not null, a int not null,
b int not null, b int not null,
@ -530,7 +531,8 @@ partition by list (a)
partitions 2 partitions 2
(partition x1 values in (4.0, 12+8), (partition x1 values in (4.0, 12+8),
partition x2 values in (3, 21)); partition x2 values in (3, 21));
ERROR HY000: VALUES IN value must be of same type as partition function ERROR 42000: VALUES value must be of same type as partition function near ' 12+8),
partition x2 values in (3, 21))' at line 8
CREATE TABLE t1 ( CREATE TABLE t1 (
a int not null, a int not null,
b int not null, b int not null,

4
mysql-test/t/partition_error.test
View File

@ -389,7 +389,7 @@ partitions 2
# #
# Partition by range, inconsistent partition function and constants # Partition by range, inconsistent partition function and constants
# #
--error 1450 --error 1064
CREATE TABLE t1 ( CREATE TABLE t1 (
a int not null, a int not null,
b int not null, b int not null,
@ -702,7 +702,7 @@ partitions 2
# #
# Partition by list, wrong constant result type (not INT) # Partition by list, wrong constant result type (not INT)
# #
--error 1450 --error 1064
CREATE TABLE t1 ( CREATE TABLE t1 (
a int not null, a int not null,
b int not null, b int not null,

4
sql/share/errmsg.txt
View File

@ -5427,8 +5427,8 @@ ER_RANGE_NOT_INCREASING_ERROR
eng "VALUES LESS THAN value must be strictly increasing for each partition" eng "VALUES LESS THAN value must be strictly increasing for each partition"
swe "V<>rden i VALUES LESS THAN m<>ste vara strikt v<>xande f<>r varje partition" swe "V<>rden i VALUES LESS THAN m<>ste vara strikt v<>xande f<>r varje partition"
ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR
eng "VALUES %s value must be of same type as partition function" eng "VALUES value must be of same type as partition function"
swe "V<>rden i VALUES %s m<EFBFBD>ste vara av samma typ som partitioneringsfunktionen" swe "V<>rden i VALUES m<>ste vara av samma typ som partitioneringsfunktionen"
ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
eng "Multiple definition of same constant in list partitioning" eng "Multiple definition of same constant in list partitioning"
swe "Multipel definition av samma konstant i list partitionering" swe "Multipel definition av samma konstant i list partitionering"

1
sql/sql_yacc.yy
View File

@ -2864,6 +2864,7 @@ part_func_max:
YYABORT; YYABORT;
} }
lex->part_info->defined_max_value= TRUE; lex->part_info->defined_max_value= TRUE;
lex->part_info->curr_part_elem->range_value= LONGLONG_MAX;
} }
| part_range_func | part_range_func
{ {