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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6748976d
Commit
6748976d
authored
Sep 09, 2014
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test failure on rpl_statements test by not listing wsrep variable.
parent
bf30585e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
mysql-test/suite/perfschema/r/rpl_statements.result
mysql-test/suite/perfschema/r/rpl_statements.result
+0
-2
sql/sql_parse.cc
sql/sql_parse.cc
+5
-4
No files found.
mysql-test/suite/perfschema/r/rpl_statements.result
View file @
6748976d
...
...
@@ -14,7 +14,6 @@ include/master-slave.inc
show variables like 'binlog_format%';
Variable_name Value
binlog_format MIXED
wsrep_forced_binlog_format NONE
drop table if exists test.marker;
select thread_id into @my_thread_id
from performance_schema.threads
...
...
@@ -59,7 +58,6 @@ Expect 1
show variables like 'binlog_format%';
Variable_name Value
binlog_format MIXED
wsrep_forced_binlog_format NONE
*** Clear statement events
*** Create/drop table, create/drop database
...
...
sql/sql_parse.cc
View file @
6748976d
...
...
@@ -3275,10 +3275,11 @@ mysql_execute_command(THD *thd)
/* in STATEMENT format, we probably have to replicate also temporary
tables, like mysql replication does
*/
if
(
WSREP_ON
&&
(
!
thd
->
is_current_stmt_binlog_format_row
()
||
if
(
WSREP
(
thd
)
&&
(
!
thd
->
is_current_stmt_binlog_format_row
()
||
!
(
create_info
.
options
&
HA_LEX_CREATE_TMP_TABLE
)))
WSREP_TO_ISOLATION_BEGIN
(
create_table
->
db
,
create_table
->
table_name
,
NULL
)
{
WSREP_TO_ISOLATION_BEGIN
(
create_table
->
db
,
create_table
->
table_name
,
NULL
)
}
#endif
/* WITH_WSREP */
/* Regular CREATE TABLE */
res
=
mysql_create_table
(
thd
,
create_table
,
...
...
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