database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source 
Conflicts:
	VERSION
	debian/mariadb-backup-10.2.files
	debian/mariadb-backup-10.2.install
	debian/mariadb-backup-10.3.files
	mysql-test/unstable-tests
This commit is contained in:
Alexander Barkov
2017-07-13 07:21:21 +04:00
parent e33bda183e daec000450
commit 29acdcd542
83 changed files with 7197 additions and 6423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.cc
View File

@@ -4140,7 +4140,7 @@ void Security_context::destroy()
if (external_user)
{
my_free(external_user);
user= NULL;
external_user= NULL;
}
my_free((char*) ip);
@@ -4358,6 +4358,10 @@ extern "C" enum thd_kill_levels thd_kill_level(const MYSQL_THD thd)
however not more often than global.progress_report_time.
If global.progress_report_time is 0, then don't send progress reports, but
check every second if the value has changed
We clear any errors that we get from sending the progress packet to
the client as we don't want to set an error without the caller knowing
about it.
*/
static void thd_send_progress(THD *thd)
@@ -4374,8 +4378,12 @@ static void thd_send_progress(THD *thd)
thd->progress.next_report_time= (report_time +
seconds_to_next * 1000000000ULL);
if (global_system_variables.progress_report_time &&
thd->variables.progress_report_time)
thd->variables.progress_report_time && !thd->is_error())
{
net_send_progress_packet(thd);
if (thd->is_error())
thd->clear_error();
}
}
}