1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä 2019-03-26 14:59:32 +02:00
commit ac4934535d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. /* Copyright (c) 2000, 2017, Oracle and/or its affiliates.
Copyright (c) 2008, 2018, MariaDB Copyright (c) 2008, 2019, MariaDB
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -3511,8 +3511,10 @@ mysql_execute_command(THD *thd)
else else
{ {
WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_SHOW); WSREP_SYNC_WAIT(thd, WSREP_SYNC_WAIT_BEFORE_SHOW);
#ifdef ENABLED_PROFILING
if (lex->sql_command == SQLCOM_SHOW_PROFILE) if (lex->sql_command == SQLCOM_SHOW_PROFILE)
thd->profiling.discard_current_query(); thd->profiling.discard_current_query();
#endif
} }
thd->status_var.last_query_cost= 0.0; thd->status_var.last_query_cost= 0.0;