diff options
| author | monty@mysql.com <> | 2004-07-12 07:38:46 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-07-12 07:38:46 +0300 |
| commit | 79b3b220be3e914bf2fded18a503895de212389a (patch) | |
| tree | 9483a2a2d886576bfbbbd5379a6f47059b5a8b0e /sql | |
| parent | 56d5e56cc61c9113b5c3de12e5a67fa106400cad (diff) | |
| download | mariadb-git-79b3b220be3e914bf2fded18a503895de212389a.tar.gz | |
Don't close already closed files in vio (not critical)
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 13 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 1ed535753b1..4fd13d33bab 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1301,6 +1301,19 @@ void yyerror(const char *s) #ifndef EMBEDDED_LIBRARY +/* + Close a connection + + SYNOPSIS + close_connection() + thd Thread handle + errcode Error code to print to console + lock 1 if we have have to lock LOCK_thread_count + + NOTES + For the connection that is doing shutdown, this is called twice +*/ + void close_connection(THD *thd, uint errcode, bool lock) { st_vio *vio; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 61b57b2f350..e83868bac7c 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -4562,7 +4562,6 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, register TABLE_LIST *ptr; char *alias_str; DBUG_ENTER("add_table_to_list"); - DBUG_PRINT("enter",("lock_option: %d", lock_type)); if (!table) DBUG_RETURN(0); // End of memory |