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
ed3ff663
Commit
ed3ff663
authored
Jun 13, 2007
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Already fixed by bug27123 fix
parent
59f309c8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
sql/sql_partition.cc
sql/sql_partition.cc
+3
-6
No files found.
sql/sql_partition.cc
View file @
ed3ff663
...
@@ -3294,16 +3294,15 @@ static uint32 get_sub_part_id_from_key(const TABLE *table,uchar *buf,
...
@@ -3294,16 +3294,15 @@ static uint32 get_sub_part_id_from_key(const TABLE *table,uchar *buf,
uint32
part_id
;
uint32
part_id
;
DBUG_ENTER
(
"get_sub_part_id_from_key"
);
DBUG_ENTER
(
"get_sub_part_id_from_key"
);
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
if
(
likely
(
rec0
==
buf
))
if
(
likely
(
rec0
==
buf
))
{
{
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
part_id
=
part_info
->
get_subpartition_id
(
part_info
);
part_id
=
part_info
->
get_subpartition_id
(
part_info
);
}
}
else
else
{
{
Field
**
part_field_array
=
part_info
->
subpart_field_array
;
Field
**
part_field_array
=
part_info
->
subpart_field_array
;
set_field_ptr
(
part_field_array
,
buf
,
rec0
);
set_field_ptr
(
part_field_array
,
buf
,
rec0
);
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
part_id
=
part_info
->
get_subpartition_id
(
part_info
);
part_id
=
part_info
->
get_subpartition_id
(
part_info
);
set_field_ptr
(
part_field_array
,
rec0
,
buf
);
set_field_ptr
(
part_field_array
,
rec0
,
buf
);
}
}
...
@@ -3340,9 +3339,9 @@ bool get_part_id_from_key(const TABLE *table, uchar *buf, KEY *key_info,
...
@@ -3340,9 +3339,9 @@ bool get_part_id_from_key(const TABLE *table, uchar *buf, KEY *key_info,
longlong
func_value
;
longlong
func_value
;
DBUG_ENTER
(
"get_part_id_from_key"
);
DBUG_ENTER
(
"get_part_id_from_key"
);
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
if
(
likely
(
rec0
==
buf
))
if
(
likely
(
rec0
==
buf
))
{
{
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
result
=
part_info
->
get_part_partition_id
(
part_info
,
part_id
,
result
=
part_info
->
get_part_partition_id
(
part_info
,
part_id
,
&
func_value
);
&
func_value
);
}
}
...
@@ -3350,7 +3349,6 @@ bool get_part_id_from_key(const TABLE *table, uchar *buf, KEY *key_info,
...
@@ -3350,7 +3349,6 @@ bool get_part_id_from_key(const TABLE *table, uchar *buf, KEY *key_info,
{
{
Field
**
part_field_array
=
part_info
->
part_field_array
;
Field
**
part_field_array
=
part_info
->
part_field_array
;
set_field_ptr
(
part_field_array
,
buf
,
rec0
);
set_field_ptr
(
part_field_array
,
buf
,
rec0
);
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
result
=
part_info
->
get_part_partition_id
(
part_info
,
part_id
,
result
=
part_info
->
get_part_partition_id
(
part_info
,
part_id
,
&
func_value
);
&
func_value
);
set_field_ptr
(
part_field_array
,
rec0
,
buf
);
set_field_ptr
(
part_field_array
,
rec0
,
buf
);
...
@@ -3390,9 +3388,9 @@ void get_full_part_id_from_key(const TABLE *table, uchar *buf,
...
@@ -3390,9 +3388,9 @@ void get_full_part_id_from_key(const TABLE *table, uchar *buf,
longlong
func_value
;
longlong
func_value
;
DBUG_ENTER
(
"get_full_part_id_from_key"
);
DBUG_ENTER
(
"get_full_part_id_from_key"
);
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
if
(
likely
(
rec0
==
buf
))
if
(
likely
(
rec0
==
buf
))
{
{
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
result
=
part_info
->
get_partition_id
(
part_info
,
&
part_spec
->
start_part
,
result
=
part_info
->
get_partition_id
(
part_info
,
&
part_spec
->
start_part
,
&
func_value
);
&
func_value
);
}
}
...
@@ -3400,7 +3398,6 @@ void get_full_part_id_from_key(const TABLE *table, uchar *buf,
...
@@ -3400,7 +3398,6 @@ void get_full_part_id_from_key(const TABLE *table, uchar *buf,
{
{
Field
**
part_field_array
=
part_info
->
full_part_field_array
;
Field
**
part_field_array
=
part_info
->
full_part_field_array
;
set_field_ptr
(
part_field_array
,
buf
,
rec0
);
set_field_ptr
(
part_field_array
,
buf
,
rec0
);
key_restore
(
buf
,
(
uchar
*
)
key_spec
->
key
,
key_info
,
key_spec
->
length
);
result
=
part_info
->
get_partition_id
(
part_info
,
&
part_spec
->
start_part
,
result
=
part_info
->
get_partition_id
(
part_info
,
&
part_spec
->
start_part
,
&
func_value
);
&
func_value
);
set_field_ptr
(
part_field_array
,
rec0
,
buf
);
set_field_ptr
(
part_field_array
,
rec0
,
buf
);
...
...
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