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
2616c7b7
Commit
2616c7b7
authored
17 years ago
by
ramil/ram@ramil.myoffice.izhnet.ru
Browse files
Options
Browse Files
Download
Plain Diff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/ram/work/b28806/b28806.5.1
parents
dcd18325
46f68b22
Branches unavailable
Tags unavailable
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
14 deletions
+39
-14
mysql-test/r/partition.result
mysql-test/r/partition.result
+14
-0
mysql-test/t/partition.test
mysql-test/t/partition.test
+17
-0
sql/ha_partition.cc
sql/ha_partition.cc
+8
-14
No files found.
mysql-test/r/partition.result
View file @
2616c7b7
...
@@ -1235,4 +1235,18 @@ aaa 2
...
@@ -1235,4 +1235,18 @@ aaa 2
drop table t1;
drop table t1;
create table t1 (s1 bigint) partition by list (s1) (partition p1 values in (-9223372036854775808));
create table t1 (s1 bigint) partition by list (s1) (partition p1 values in (-9223372036854775808));
drop table t1;
drop table t1;
create table t1(a int auto_increment, b int, primary key (b, a))
partition by hash(b) partitions 2;
insert into t1 values (null, 1);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t1 MyISAM 10 Fixed 1 9 9 0 0 0 1 NULL NULL NULL latin1_swedish_ci NULL partitioned
drop table t1;
create table t1(a int auto_increment primary key)
partition by key(a) partitions 2;
insert into t1 values (null), (null), (null);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t1 MyISAM 10 Fixed 3 7 21 0 0 0 4 NULL NULL NULL latin1_swedish_ci NULL partitioned
drop table t1;
End of 5.1 tests
End of 5.1 tests
This diff is collapsed.
Click to expand it.
mysql-test/t/partition.test
View file @
2616c7b7
...
@@ -1448,4 +1448,21 @@ drop table t1;
...
@@ -1448,4 +1448,21 @@ drop table t1;
create
table
t1
(
s1
bigint
)
partition
by
list
(
s1
)
(
partition
p1
values
in
(
-
9223372036854775808
));
create
table
t1
(
s1
bigint
)
partition
by
list
(
s1
)
(
partition
p1
values
in
(
-
9223372036854775808
));
drop
table
t1
;
drop
table
t1
;
#
# Bug #28806: Running SHOW TABLE STATUS during high INSERT load crashes server
#
create
table
t1
(
a
int
auto_increment
,
b
int
,
primary
key
(
b
,
a
))
partition
by
hash
(
b
)
partitions
2
;
insert
into
t1
values
(
null
,
1
);
--
replace_column
9
0
12
NULL
13
NULL
14
NULL
show
table
status
;
drop
table
t1
;
create
table
t1
(
a
int
auto_increment
primary
key
)
partition
by
key
(
a
)
partitions
2
;
insert
into
t1
values
(
null
),
(
null
),
(
null
);
--
replace_column
9
0
12
NULL
13
NULL
14
NULL
show
table
status
;
drop
table
t1
;
--
echo
End
of
5.1
tests
--
echo
End
of
5.1
tests
This diff is collapsed.
Click to expand it.
sql/ha_partition.cc
View file @
2616c7b7
...
@@ -4253,22 +4253,16 @@ int ha_partition::info(uint flag)
...
@@ -4253,22 +4253,16 @@ int ha_partition::info(uint flag)
if
(
flag
&
HA_STATUS_AUTO
)
if
(
flag
&
HA_STATUS_AUTO
)
{
{
ulonglong
nb_reserved_values
;
ulonglong
auto_increment_value
=
0
;
DBUG_PRINT
(
"info"
,
(
"HA_STATUS_AUTO"
));
DBUG_PRINT
(
"info"
,
(
"HA_STATUS_AUTO"
));
/* we don't want to reserve any values, it's pure information */
file_array
=
m_file
;
do
if
(
table
->
found_next_number_field
)
{
{
/*
file
=
*
file_array
;
Can only call get_auto_increment for tables that actually
file
->
info
(
HA_STATUS_AUTO
);
have auto_increment columns, otherwise there will be
set_if_bigger
(
auto_increment_value
,
file
->
stats
.
auto_increment_value
);
problems in handlers that don't expect get_auto_increment
}
while
(
*
(
++
file_array
));
for non-autoincrement tables.
stats
.
auto_increment_value
=
auto_increment_value
;
*/
get_auto_increment
(
0
,
0
,
0
,
&
stats
.
auto_increment_value
,
&
nb_reserved_values
);
release_auto_increment
();
}
}
}
if
(
flag
&
HA_STATUS_VARIABLE
)
if
(
flag
&
HA_STATUS_VARIABLE
)
{
{
...
...
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