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
b65bbb2f
Commit
b65bbb2f
authored
Aug 30, 2024
by
Julius Goryavsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-34647: small refactoring after main fix
parent
74d71687
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
26 deletions
+26
-26
sql/sql_parse.cc
sql/sql_parse.cc
+26
-26
No files found.
sql/sql_parse.cc
View file @
b65bbb2f
...
...
@@ -4747,10 +4747,12 @@ mysql_execute_command(THD *thd)
#ifdef WITH_WSREP
if
(
wsrep
&&
!
first_table
->
view
)
{
bool
is_innodb
=
first_table
->
table
->
file
->
partition_ht
()
->
db_type
==
DB_TYPE_INNODB
;
const
legacy_db_type
db_type
=
first_table
->
table
->
file
->
partition_ht
()
->
db_type
;
// For InnoDB we don't need to worry about anything here:
if
(
db_type
!=
DB_TYPE_INNODB
)
{
// For consistency check inserted table needs to be InnoDB
if
(
!
is_innodb
&&
thd
->
wsrep_consistency_check
!=
NO_CONSISTENCY_CHECK
)
if
(
thd
->
wsrep_consistency_check
!=
NO_CONSISTENCY_CHECK
)
{
push_warning_printf
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
HA_ERR_UNSUPPORTED
,
...
...
@@ -4758,25 +4760,23 @@ mysql_execute_command(THD *thd)
" for InnoDB tables."
);
thd
->
wsrep_consistency_check
=
NO_CONSISTENCY_CHECK
;
}
/* Only TOI allowed to !InnoDB tables */
if
(
!
is_innodb
&&
wsrep_OSU_method_get
(
thd
)
!=
WSREP_OSU_TOI
)
if
(
wsrep_OSU_method_get
(
thd
)
!=
WSREP_OSU_TOI
)
{
my_error
(
ER_NOT_SUPPORTED_YET
,
MYF
(
0
),
"RSU on this table engine"
);
break
;
}
// For !InnoDB we start TOI if it is not yet started and hope for the best
if
(
!
is_innodb
&&
!
wsrep_toi
)
if
(
!
wsrep_toi
)
{
const
legacy_db_type
db_type
=
first_table
->
table
->
file
->
partition_ht
()
->
db_type
;
/* Currently we support TOI for MyISAM only. */
if
(
db_type
==
DB_TYPE_MYISAM
&&
wsrep_replicate_myisam
)
WSREP_TO_ISOLATION_BEGIN
(
first_table
->
db
.
str
,
first_table
->
table_name
.
str
,
NULL
);
}
}
}
#endif
/* WITH_WSREP */
/*
Only the INSERT table should be merged. Other will be handled by
select.
...
...
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