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
8271f589
Commit
8271f589
authored
18 years ago
by
gluh@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
parents
5e77d287
bcf710e9
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
221 additions
and
12 deletions
+221
-12
mysql-test/r/ndb_partition_error.result
mysql-test/r/ndb_partition_error.result
+9
-0
mysql-test/r/partition.result
mysql-test/r/partition.result
+49
-0
mysql-test/t/ndb_partition_error.test
mysql-test/t/ndb_partition_error.test
+13
-0
mysql-test/t/partition.test
mysql-test/t/partition.test
+57
-0
sql/ha_ndbcluster.cc
sql/ha_ndbcluster.cc
+1
-0
sql/ha_partition.cc
sql/ha_partition.cc
+1
-0
sql/partition_element.h
sql/partition_element.h
+2
-1
sql/partition_info.h
sql/partition_info.h
+6
-1
sql/sql_partition.cc
sql/sql_partition.cc
+41
-0
sql/sql_show.cc
sql/sql_show.cc
+6
-0
sql/sql_yacc.yy
sql/sql_yacc.yy
+36
-10
No files found.
mysql-test/r/ndb_partition_error.result
View file @
8271f589
...
...
@@ -36,3 +36,12 @@ INSERT INTO t1 VALUES (2);
UPDATE t1 SET id=5 WHERE id=2;
ERROR HY000: Table has no partition for value 5
DROP TABLE t1;
create table t1 (a int,b int, c int)
engine = ndb
partition by list(a)
partitions 2
(partition x123 values in (11, 12),
partition x234 values in (5, 1));
insert into t1 values (NULL,1,1);
ERROR HY000: Table has no partition for value NULL
drop table t1;
This diff is collapsed.
Click to expand it.
mysql-test/r/partition.result
View file @
8271f589
...
...
@@ -373,4 +373,53 @@ end//
call p()//
drop procedure p//
drop table t1//
create table t1 (a int,b int,c int,key(a,b))
partition by range (a)
partitions 3
(partition x1 values less than (0) tablespace ts1,
partition x2 values less than (10) tablespace ts2,
partition x3 values less than maxvalue tablespace ts3);
insert into t1 values (NULL, 1, 1);
insert into t1 values (0, 1, 1);
insert into t1 values (12, 1, 1);
select partition_name, partition_description, table_rows
from information_schema.partitions where table_schema ='test';
partition_name partition_description table_rows
x1 0 1
x2 10 1
x3 MAXVALUE 1
drop table t1;
create table t1 (a int,b int, c int)
partition by list(a)
partitions 2
(partition x123 values in (11,12),
partition x234 values in (1 ,NULL, NULL));
ERROR HY000: Multiple definition of same constant in list partitioning
create table t1 (a int,b int, c int)
partition by list(a)
partitions 2
(partition x123 values in (11, NULL),
partition x234 values in (1 ,NULL));
ERROR HY000: Multiple definition of same constant in list partitioning
create table t1 (a int,b int, c int)
partition by list(a)
partitions 2
(partition x123 values in (11, 12),
partition x234 values in (5, 1));
insert into t1 values (NULL,1,1);
ERROR HY000: Table has no partition for value NULL
drop table t1;
create table t1 (a int,b int, c int)
partition by list(a)
partitions 2
(partition x123 values in (11, 12),
partition x234 values in (NULL, 1));
insert into t1 values (11,1,6);
insert into t1 values (NULL,1,1);
select partition_name, partition_description, table_rows
from information_schema.partitions where table_schema ='test';
partition_name partition_description table_rows
x123 11,12 1
x234 NULL,1 1
drop table t1;
End of 5.1 tests
This diff is collapsed.
Click to expand it.
mysql-test/t/ndb_partition_error.test
View file @
8271f589
...
...
@@ -56,3 +56,16 @@ INSERT INTO t1 VALUES (2);
--
error
ER_NO_PARTITION_FOR_GIVEN_VALUE
UPDATE
t1
SET
id
=
5
WHERE
id
=
2
;
DROP
TABLE
t1
;
#
# NULL for LIST partition
#
create
table
t1
(
a
int
,
b
int
,
c
int
)
engine
=
ndb
partition
by
list
(
a
)
partitions
2
(
partition
x123
values
in
(
11
,
12
),
partition
x234
values
in
(
5
,
1
));
--
error
1504
insert
into
t1
values
(
NULL
,
1
,
1
);
drop
table
t1
;
This diff is collapsed.
Click to expand it.
mysql-test/t/partition.test
View file @
8271f589
...
...
@@ -483,4 +483,61 @@ drop procedure p//
drop
table
t1
//
delimiter
;
//
#
# Bug #15447 Partitions: NULL is treated as zero
#
# NULL for RANGE partition
create
table
t1
(
a
int
,
b
int
,
c
int
,
key
(
a
,
b
))
partition
by
range
(
a
)
partitions
3
(
partition
x1
values
less
than
(
0
)
tablespace
ts1
,
partition
x2
values
less
than
(
10
)
tablespace
ts2
,
partition
x3
values
less
than
maxvalue
tablespace
ts3
);
insert
into
t1
values
(
NULL
,
1
,
1
);
insert
into
t1
values
(
0
,
1
,
1
);
insert
into
t1
values
(
12
,
1
,
1
);
select
partition_name
,
partition_description
,
table_rows
from
information_schema
.
partitions
where
table_schema
=
'test'
;
drop
table
t1
;
# NULL for LIST partition
--
error
1473
create
table
t1
(
a
int
,
b
int
,
c
int
)
partition
by
list
(
a
)
partitions
2
(
partition
x123
values
in
(
11
,
12
),
partition
x234
values
in
(
1
,
NULL
,
NULL
));
--
error
1473
create
table
t1
(
a
int
,
b
int
,
c
int
)
partition
by
list
(
a
)
partitions
2
(
partition
x123
values
in
(
11
,
NULL
),
partition
x234
values
in
(
1
,
NULL
));
create
table
t1
(
a
int
,
b
int
,
c
int
)
partition
by
list
(
a
)
partitions
2
(
partition
x123
values
in
(
11
,
12
),
partition
x234
values
in
(
5
,
1
));
--
error
1504
insert
into
t1
values
(
NULL
,
1
,
1
);
drop
table
t1
;
create
table
t1
(
a
int
,
b
int
,
c
int
)
partition
by
list
(
a
)
partitions
2
(
partition
x123
values
in
(
11
,
12
),
partition
x234
values
in
(
NULL
,
1
));
insert
into
t1
values
(
11
,
1
,
6
);
insert
into
t1
values
(
NULL
,
1
,
1
);
select
partition_name
,
partition_description
,
table_rows
from
information_schema
.
partitions
where
table_schema
=
'test'
;
drop
table
t1
;
--
echo
End
of
5.1
tests
This diff is collapsed.
Click to expand it.
sql/ha_ndbcluster.cc
View file @
8271f589
...
...
@@ -6028,6 +6028,7 @@ void ha_ndbcluster::print_error(int error, myf errflag)
{
char
buf
[
100
];
my_error
(
ER_NO_PARTITION_FOR_GIVEN_VALUE
,
MYF
(
0
),
m_part_info
->
part_expr
->
null_value
?
"NULL"
:
llstr
(
m_part_info
->
part_expr
->
val_int
(),
buf
));
}
else
...
...
This diff is collapsed.
Click to expand it.
sql/ha_partition.cc
View file @
8271f589
...
...
@@ -5092,6 +5092,7 @@ void ha_partition::print_error(int error, myf errflag)
{
char
buf
[
100
];
my_error
(
ER_NO_PARTITION_FOR_GIVEN_VALUE
,
MYF
(
0
),
m_part_info
->
part_expr
->
null_value
?
"NULL"
:
llstr
(
m_part_info
->
part_expr
->
val_int
(),
buf
));
}
else
...
...
This diff is collapsed.
Click to expand it.
sql/partition_element.h
View file @
8271f589
...
...
@@ -51,13 +51,14 @@ class partition_element :public Sql_alloc {
handlerton
*
engine_type
;
enum
partition_state
part_state
;
uint16
nodegroup_id
;
bool
has_null_value
;
partition_element
()
:
part_max_rows
(
0
),
part_min_rows
(
0
),
partition_name
(
NULL
),
tablespace_name
(
NULL
),
range_value
(
0
),
part_comment
(
NULL
),
data_file_name
(
NULL
),
index_file_name
(
NULL
),
engine_type
(
NULL
),
part_state
(
PART_NORMAL
),
nodegroup_id
(
UNDEF_NODEGROUP
)
nodegroup_id
(
UNDEF_NODEGROUP
)
,
has_null_value
(
FALSE
)
{
subpartitions
.
empty
();
list_val_list
.
empty
();
...
...
This diff is collapsed.
Click to expand it.
sql/partition_info.h
View file @
8271f589
...
...
@@ -181,6 +181,9 @@ class partition_info : public Sql_alloc
bool
linear_hash_ind
;
bool
fixed
;
bool
from_openfrm
;
bool
has_null_value
;
uint
has_null_part_id
;
partition_info
()
:
get_partition_id
(
NULL
),
get_part_partition_id
(
NULL
),
...
...
@@ -211,7 +214,9 @@ class partition_info : public Sql_alloc
list_of_part_fields
(
FALSE
),
list_of_subpart_fields
(
FALSE
),
linear_hash_ind
(
FALSE
),
fixed
(
FALSE
),
from_openfrm
(
FALSE
)
from_openfrm
(
FALSE
),
has_null_value
(
FALSE
),
has_null_part_id
(
0
)
{
all_fields_in_PF
.
clear_all
();
all_fields_in_PPF
.
clear_all
();
...
...
This diff is collapsed.
Click to expand it.
sql/sql_partition.cc
View file @
8271f589
...
...
@@ -531,6 +531,7 @@ static bool check_list_constants(partition_info *part_info)
bool
result
=
TRUE
;
longlong
curr_value
,
prev_value
;
partition_element
*
part_def
;
bool
found_null
=
FALSE
;
List_iterator
<
partition_element
>
list_func_it
(
part_info
->
partitions
);
DBUG_ENTER
(
"check_list_constants"
);
...
...
@@ -556,6 +557,17 @@ static bool check_list_constants(partition_info *part_info)
do
{
part_def
=
list_func_it
++
;
if
(
part_def
->
has_null_value
)
{
if
(
found_null
)
{
my_error
(
ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR
,
MYF
(
0
));
goto
end
;
}
part_info
->
has_null_value
=
TRUE
;
part_info
->
has_null_part_id
=
i
;
found_null
=
TRUE
;
}
List_iterator
<
longlong
>
list_val_it1
(
part_def
->
list_val_list
);
while
(
list_val_it1
++
)
no_list_values
++
;
...
...
@@ -2041,6 +2053,16 @@ static int add_partition_values(File fptr, partition_info *part_info,
err
+=
add_string
(
fptr
,
"VALUES IN "
);
uint
no_items
=
p_elem
->
list_val_list
.
elements
;
err
+=
add_begin_parenthesis
(
fptr
);
if
(
p_elem
->
has_null_value
)
{
err
+=
add_string
(
fptr
,
"NULL"
);
if
(
no_items
==
0
)
{
err
+=
add_end_parenthesis
(
fptr
);
goto
end
;
}
err
+=
add_comma
(
fptr
);
}
i
=
0
;
do
{
...
...
@@ -2051,6 +2073,7 @@ static int add_partition_values(File fptr, partition_info *part_info,
}
while
(
++
i
<
no_items
);
err
+=
add_end_parenthesis
(
fptr
);
}
end:
return
err
+
add_space
(
fptr
);
}
...
...
@@ -2631,6 +2654,15 @@ int get_partition_id_list(partition_info *part_info,
longlong
part_func_value
=
part_val_int
(
part_info
->
part_expr
);
DBUG_ENTER
(
"get_partition_id_list"
);
if
(
part_info
->
part_expr
->
null_value
)
{
if
(
part_info
->
has_null_value
)
{
*
part_id
=
part_info
->
has_null_part_id
;
DBUG_RETURN
(
0
);
}
goto
notfound
;
}
*
func_value
=
part_func_value
;
while
(
max_list_index
>=
min_list_index
)
{
...
...
@@ -2741,6 +2773,11 @@ int get_partition_id_range(partition_info *part_info,
longlong
part_func_value
=
part_val_int
(
part_info
->
part_expr
);
DBUG_ENTER
(
"get_partition_id_int_range"
);
if
(
part_info
->
part_expr
->
null_value
)
{
*
part_id
=
0
;
DBUG_RETURN
(
0
);
}
while
(
max_part_id
>
min_part_id
)
{
loc_part_id
=
(
max_part_id
+
min_part_id
+
1
)
>>
1
;
...
...
@@ -2814,6 +2851,10 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info,
uint
min_part_id
=
0
,
max_part_id
=
max_partition
,
loc_part_id
;
/* Get the partitioning function value for the endpoint */
longlong
part_func_value
=
part_val_int
(
part_info
->
part_expr
);
if
(
part_info
->
part_expr
->
null_value
)
DBUG_RETURN
(
0
);
while
(
max_part_id
>
min_part_id
)
{
loc_part_id
=
(
max_part_id
+
min_part_id
+
1
)
>>
1
;
...
...
This diff is collapsed.
Click to expand it.
sql/sql_show.cc
View file @
8271f589
...
...
@@ -3832,6 +3832,12 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
uint
no_items
=
part_elem
->
list_val_list
.
elements
;
tmp_str
.
length
(
0
);
tmp_res
.
length
(
0
);
if
(
part_elem
->
has_null_value
)
{
tmp_str
.
append
(
"NULL"
);
if
(
no_items
>
0
)
tmp_str
.
append
(
","
);
}
while
((
list_value
=
list_val_it
++
))
{
tmp_res
.
set
(
*
list_value
,
cs
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_yacc.yy
View file @
8271f589
...
...
@@ -42,6 +42,12 @@
#include <myisam.h>
#include <myisammrg.h>
typedef struct p_elem_val
{
longlong value;
bool null_value;
} part_elem_value;
int yylex(void *yylval, void *yythd);
const LEX_STRING null_lex_str={0,0};
...
...
@@ -105,6 +111,7 @@ inline Item *is_truth_value(Item *A, bool v1, bool v2)
sp_name *spname;
struct st_lex *lex;
sp_head *sphead;
struct p_elem_val *p_elem_value;
}
%{
...
...
@@ -752,7 +759,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
%type <ulonglong_number>
ulonglong_num size_number
%type <
longlong_number
>
%type <
p_elem_value
>
part_bit_expr
%type <lock_type>
...
...
@@ -3781,7 +3788,7 @@ part_func_max:
part_range_func:
'(' part_bit_expr ')'
{
Lex->part_info->curr_part_elem->range_value= $2;
Lex->part_info->curr_part_elem->range_value= $2
->value
;
}
;
...
...
@@ -3793,12 +3800,12 @@ part_list_func:
part_list_item:
part_bit_expr
{
longlong *value_ptr
;
if (!
(value_ptr= (longlong*)sql_alloc(sizeof(longlong))) ||
((*value_ptr= $1, FALSE) ||
Lex->part_info->curr_part_elem->list_val_list.push_back(value_ptr)
))
part_elem_value *value_ptr= $1
;
if (!
value_ptr->null_value &&
Lex->part_info->curr_part_elem->
list_val_list.push_back((longlong*) &value_ptr->value
))
{
mem_alloc_error(sizeof(
longlong
));
mem_alloc_error(sizeof(
part_elem_value
));
YYABORT;
}
}
...
...
@@ -3818,6 +3825,15 @@ part_bit_expr:
context->table_list= 0;
thd->where= "partition function";
part_elem_value *value_ptr=
(part_elem_value*)sql_alloc(sizeof(part_elem_value));
if (!value_ptr)
{
mem_alloc_error(sizeof(part_elem_value));
YYABORT;
}
if (part_expr->fix_fields(YYTHD, (Item**)0) ||
((context->table_list= save_list), FALSE) ||
(!part_expr->const_item()) ||
...
...
@@ -3827,13 +3843,23 @@ part_bit_expr:
YYABORT;
}
thd->where= save_where;
if (part_expr->result_type() != INT_RESULT)
value_ptr->value= part_expr->val_int();
if ((value_ptr->null_value= part_expr->null_value))
{
if (Lex->part_info->curr_part_elem->has_null_value)
{
my_error(ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR, MYF(0));
YYABORT;
}
Lex->part_info->curr_part_elem->has_null_value= TRUE;
}
else if (part_expr->result_type() != INT_RESULT &&
!part_expr->null_value)
{
yyerror(ER(ER_INCONSISTENT_TYPE_OF_FUNCTIONS_ERROR));
YYABORT;
}
item_value= part_expr->val_int();
$$= item_value;
$$= value_ptr;
}
;
...
...
This diff is collapsed.
Click to expand it.
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