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
ac493453
Commit
ac493453
authored
Mar 26, 2019
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Plain Diff
Merge 10.1 into 10.2
parents
226ca250
f2c1c959
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
sql/sql_parse.cc
sql/sql_parse.cc
+3
-1
No files found.
sql/sql_parse.cc
View file @
ac493453
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
Copyright (c) 2008, 201
8
, MariaDB
Copyright (c) 2008, 201
9
, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
...
...
@@ -3511,8 +3511,10 @@ mysql_execute_command(THD *thd)
else
{
WSREP_SYNC_WAIT
(
thd
,
WSREP_SYNC_WAIT_BEFORE_SHOW
);
#ifdef ENABLED_PROFILING
if
(
lex
->
sql_command
==
SQLCOM_SHOW_PROFILE
)
thd
->
profiling
.
discard_current_query
();
#endif
}
thd
->
status_var
.
last_query_cost
=
0.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