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
b2340cdd
Commit
b2340cdd
authored
May 19, 2021
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix compilation w/o partitioning
parent
f44c5e5e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
sql/handler.cc
sql/handler.cc
+5
-1
No files found.
sql/handler.cc
View file @
b2340cdd
...
@@ -1009,7 +1009,9 @@ void handler::log_not_redoable_operation(const char *operation)
...
@@ -1009,7 +1009,9 @@ void handler::log_not_redoable_operation(const char *operation)
We can't use partition_engine() here as this function is called
We can't use partition_engine() here as this function is called
directly by the handler for the underlaying partition table
directly by the handler for the underlaying partition table
*/
*/
#ifdef WITH_PARTITION_STORAGE_ENGINE
ddl_log
.
org_partitioned
=
table
->
s
->
partition_info_str
!=
0
;
ddl_log
.
org_partitioned
=
table
->
s
->
partition_info_str
!=
0
;
#endif
lex_string_set
(
&
ddl_log
.
org_storage_engine_name
,
table_type
());
lex_string_set
(
&
ddl_log
.
org_storage_engine_name
,
table_type
());
ddl_log
.
org_database
=
table
->
s
->
db
;
ddl_log
.
org_database
=
table
->
s
->
db
;
ddl_log
.
org_table
=
table
->
s
->
table_name
;
ddl_log
.
org_table
=
table
->
s
->
table_name
;
...
@@ -5904,6 +5906,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
...
@@ -5904,6 +5906,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
if
(
!
hton
)
if
(
!
hton
)
hton
=
&
dummy
;
hton
=
&
dummy
;
*
hton
=
element
->
share
->
db_type
();
*
hton
=
element
->
share
->
db_type
();
#ifdef WITH_PARTITION_STORAGE_ENGINE
if
(
partition_engine_name
&&
element
->
share
->
db_type
()
==
partition_hton
)
if
(
partition_engine_name
&&
element
->
share
->
db_type
()
==
partition_hton
)
{
{
if
(
!
static_cast
<
Partition_share
*>
(
element
->
share
->
ha_share
)
->
if
(
!
static_cast
<
Partition_share
*>
(
element
->
share
->
ha_share
)
->
...
@@ -5917,6 +5920,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
...
@@ -5917,6 +5920,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
static_cast
<
Partition_share
*>
(
element
->
share
->
ha_share
)
->
static_cast
<
Partition_share
*>
(
element
->
share
->
ha_share
)
->
partition_engine_name
);
partition_engine_name
);
}
}
#endif
*
is_sequence
=
element
->
share
->
table_type
==
TABLE_TYPE_SEQUENCE
;
*
is_sequence
=
element
->
share
->
table_type
==
TABLE_TYPE_SEQUENCE
;
if
(
*
hton
!=
view_pseudo_hton
&&
element
->
share
->
tabledef_version
.
length
&&
if
(
*
hton
!=
view_pseudo_hton
&&
element
->
share
->
tabledef_version
.
length
&&
table_id
&&
table_id
&&
...
@@ -5927,7 +5931,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
...
@@ -5927,7 +5931,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
}
}
retry_from_frm:
retry_from_frm:
__attribute__
((
unused
));
char
path
[
FN_REFLEN
+
1
];
char
path
[
FN_REFLEN
+
1
];
size_t
path_len
=
build_table_filename
(
path
,
sizeof
(
path
)
-
1
,
size_t
path_len
=
build_table_filename
(
path
,
sizeof
(
path
)
-
1
,
db
->
str
,
table_name
->
str
,
""
,
0
);
db
->
str
,
table_name
->
str
,
""
,
0
);
...
...
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