diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-07-29 16:03:41 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2013-07-29 16:03:41 +0200 |
| commit | 3ef0157daa3593d2003e14fac3a7a8a249e9c048 (patch) | |
| tree | 89743bedcf041c1cb81a72ca2021da2a7f4c46c4 /storage | |
| parent | 9e13011efb137728e14a89d936616a14ebee8f59 (diff) | |
| download | mariadb-git-3ef0157daa3593d2003e14fac3a7a8a249e9c048.tar.gz | |
MDEV-4815 - allow multiple mysql_server_init() / mysql_server_end() in the same process, for embedded library.
- Reset static variables that are used to signal "init done" for DBUG, in dbug_end()
- Set string server variables to NULL after memory for the value is freed - avoids double free()
- fix DBUG_ASSERTs that happened during reinitialization.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/os/os0file.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c index ae6ba05c9f6..5beed447c91 100644 --- a/storage/xtradb/os/os0file.c +++ b/storage/xtradb/os/os0file.c @@ -3773,6 +3773,10 @@ os_aio_free(void) ut_free(os_aio_segment_wait_events); os_aio_segment_wait_events = 0; os_aio_n_segments = 0; +#ifdef _WIN32 + completion_port = 0; + read_completion_port = 0; +#endif } #ifdef WIN_ASYNC_IO |