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

Don't close already closed files in vio (not critical)

Browse Source 
mysys/my_init.c:
  Extra debugging
sql/mysqld.cc:
  Added comment
sql/sql_parse.cc:
  Removed unneeded info
vio/viosocket.c:
  Added assert.
  Don't close already closed files
This commit is contained in:
unknown 2004-07-12 07:38:46 +03:00
parent 4ba63c4e8d
commit 18d974a3e7
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mysys/my_init.c
View File

@ -127,6 +127,7 @@ void my_end(int infoflag)
FILE *info_file; FILE *info_file;
if (!(info_file=DBUG_FILE)) if (!(info_file=DBUG_FILE))
info_file=stderr; info_file=stderr;
DBUG_PRINT("info",("Shutting down"));
if (infoflag & MY_CHECK_ERROR || info_file != stderr) if (infoflag & MY_CHECK_ERROR || info_file != stderr)
{ /* Test if some file is left open */ { /* Test if some file is left open */
if (my_file_opened | my_stream_opened) if (my_file_opened | my_stream_opened)

13
sql/mysqld.cc
View File

@ -1301,6 +1301,19 @@ void yyerror(const char *s)
#ifndef EMBEDDED_LIBRARY #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) void close_connection(THD *thd, uint errcode, bool lock)
{ {
st_vio *vio; st_vio *vio;

1
sql/sql_parse.cc
View File

@ -4562,7 +4562,6 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
register TABLE_LIST *ptr; register TABLE_LIST *ptr;
char *alias_str; char *alias_str;
DBUG_ENTER("add_table_to_list"); DBUG_ENTER("add_table_to_list");
DBUG_PRINT("enter",("lock_option: %d", lock_type));
if (!table) if (!table)
DBUG_RETURN(0); // End of memory DBUG_RETURN(0); // End of memory

4
vio/viosocket.c
View File

@ -203,9 +203,11 @@ int vio_close(Vio * vio)
#endif #endif
r=CloseHandle(vio->hPipe); r=CloseHandle(vio->hPipe);
} }
else if (vio->type != VIO_CLOSED) else
#endif /* __WIN__ */ #endif /* __WIN__ */
if (vio->type != VIO_CLOSED)
{ {
DBUG_ASSERT(vio->sd >= 0);
if (shutdown(vio->sd,2)) if (shutdown(vio->sd,2))
r= -1; r= -1;
if (closesocket(vio->sd)) if (closesocket(vio->sd))