diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-10 10:36:51 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-10 10:36:51 +0300 |
commit | 2a955c7a834aca8ae966a2922cd289bf2f9d67d9 (patch) | |
tree | ab2d03766f65b2dffe4d1ac043395548f108f5ef /sql/sql_prepare.cc | |
parent | 5646c4315918c1e4127bfb68b70d1c5333bfc2c7 (diff) | |
parent | 61b32df93119635570f42a96d0b99c7ea398430b (diff) | |
download | mariadb-git-2a955c7a834aca8ae966a2922cd289bf2f9d67d9.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r-- | sql/sql_prepare.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index ebe841daf6f..09d31470a00 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -3214,7 +3214,7 @@ static void mysql_stmt_execute_common(THD *thd, sp_cache_enforce_limit(thd->sp_package_body_cache, stored_program_cache_size); /* Close connection socket; for use with client testing (Bug#43560). */ - DBUG_EXECUTE_IF("close_conn_after_stmt_execute", vio_close(thd->net.vio);); + DBUG_EXECUTE_IF("close_conn_after_stmt_execute", vio_shutdown(thd->net.vio,SHUT_RD);); DBUG_VOID_RETURN; } |