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
2aaed448
Commit
2aaed448
authored
Jul 24, 2017
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression on galera.partition test case by commenting the problematic condition.
parent
07f8360f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+12
-3
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
2aaed448
...
...
@@ -6000,13 +6000,22 @@ ha_innobase::write_row(
prebuilt
->
table
->
flags
,
user_thd
);
#ifdef WITH_WSREP
fprintf
(
stderr
,
"JAN: split %d load %d
\n
"
,
wsrep_load_data_splitting
,
sql_command
==
SQLCOM_LOAD
);
if
(
!
error_result
&&
wsrep_on
(
user_thd
)
&&
wsrep_thd_exec_mode
(
user_thd
)
==
LOCAL_STATE
&&
!
wsrep_consistency_check
(
user_thd
)
&&
(
sql_command
!=
SQLCOM_CREATE_TABLE
)
&&
(
sql_command
!=
SQLCOM_LOAD
||
thd_binlog_format
(
user_thd
)
==
BINLOG_FORMAT_ROW
))
{
&&
(
sql_command
!=
SQLCOM_CREATE_TABLE
))
{
/* This change part of commit
a4bc8db216b4dd61ca0b1cb5a8b7806437416dc7
MW-322 - CTAS fix will cause regression on galera.partition
test case. Commented until galeracluster developers have
looked the issue.
&& (sql_command != SQLCOM_LOAD ||
thd_binlog_format(user_thd) ==
BINLOG_FORMAT_ROW)) {
*/
if
(
wsrep_append_keys
(
user_thd
,
false
,
record
,
NULL
))
{
DBUG_PRINT
(
"wsrep"
,
(
"row key failed"
));
...
...
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