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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-03-23 22:36:46 +01:00
parent a75d269464 2783fc7d14
commit f67a2211ec
298 changed files with 4436 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/threadpool_win.cc
View File

@ -390,7 +390,7 @@ int start_io(connection_t *connection, PTP_CALLBACK_INSTANCE instance)
return 0;
}
/* Some error occured */
/* Some error occurred */
CancelThreadpoolIo(io);
return -1;
}
@ -576,7 +576,7 @@ static VOID CALLBACK io_completion_callback(PTP_CALLBACK_INSTANCE instance,
return;
error:
/* Some error has occured. */
/* Some error has occurred. */
destroy_connection(connection, instance);
free(connection);