diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-12-09 14:29:32 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-12-09 14:29:32 +0400 |
| commit | 03922bb3871766f58dafbb465c67c8f66e1aad4b (patch) | |
| tree | 07c92bcb1b22dfcff1ef692cb57029641249b53f /sql/sql_base.cc | |
| parent | 09bad0958452df9323fcb9049f62a23468e978f5 (diff) | |
| download | mariadb-git-bb-10.4-svoj-backup.tar.gz | |
Fixed false positive from close_cached_connection_tablesbb-10.4-svoj-backup
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 5c33d03f4cd..ccff8568973 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -658,6 +658,7 @@ end: bool close_cached_connection_tables(THD *thd, LEX_CSTRING *connection) { + bool res= false; close_cached_connection_tables_arg argument; DBUG_ENTER("close_cached_connections"); DBUG_ASSERT(thd); @@ -672,12 +673,12 @@ bool close_cached_connection_tables(THD *thd, LEX_CSTRING *connection) DBUG_RETURN(true); for (TABLE_LIST *table= argument.tables; table; table= table->next_local) - tdc_remove_table(thd, TDC_RT_REMOVE_UNUSED, - table->db.str, - table->table_name.str, TRUE); + res|= tdc_remove_table(thd, TDC_RT_REMOVE_UNUSED, + table->db.str, + table->table_name.str, TRUE); /* Return true if we found any open connections */ - DBUG_RETURN(MY_TEST(argument.tables)); + DBUG_RETURN(res); } |