summaryrefslogtreecommitdiff
path: root/include/my_sys.h
diff options
context:
space:
mode:
authorMagne Mahre <magne.mahre@oracle.com>2011-03-01 13:03:31 +0100
committerMagne Mahre <magne.mahre@oracle.com>2011-03-01 13:03:31 +0100
commit48126a574cb31952032eb3c0ff07eaab101dc9e0 (patch)
tree4d9a20cb9667d0482370dd73a32cf5c74f73289e /include/my_sys.h
parent626b835f4cff692ca93b787423e82aa036daac0b (diff)
downloadmariadb-git-48126a574cb31952032eb3c0ff07eaab101dc9e0.tar.gz
Bug#11765237 - 58179: CANNOT START MYSQLD WITH APP VERIFIER
Bug#11763065 - 55730: KILL_SERVER() CALLS SETEVENT ON A NULL HANDLE, SMEM_EVENT_CONNECT_REQUEST Application Verifier is a Microsoft tool used for detecting certain classes of programming errors. In particular, MS Windows OS resource usage is monitored for wrong usage (handles, thread local storage, critical sections, ...) In MySQL 5.5.x, an error was introduced where an object on thread local storage was used before the TLS and the object was created. The fix has been to move the mysys initialization to an earlier stage in the boot process when built for Windows. For non-win builds, the init already happens early. Some un-tangling of calls to my_init(), my_basic_init() and my_thread_global_init() was done. There is no longer a need to do init in steps, so the full my_init() is called instead of my_init_basic(). In addition, Bug#11763065 was fixed. The event handle 'smem_event_connect_request' is only created if 'opt_enable_shared_memory' is set. When killing the server, an event was flagged on the handle unconditionally. Added a test, so it will only be flagged if created.
Diffstat (limited to 'include/my_sys.h')
-rw-r--r--include/my_sys.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index fb8fa6e7a3e..f0b2c1a0636 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -641,7 +641,6 @@ extern int my_error_register(const char** (*get_errmsgs) (),
extern const char **my_error_unregister(int first, int last);
extern void my_message(uint my_err, const char *str,myf MyFlags);
extern void my_message_stderr(uint my_err, const char *str, myf MyFlags);
-extern my_bool my_basic_init(void);
extern my_bool my_init(void);
extern void my_end(int infoflag);
extern int my_redel(const char *from, const char *to, int MyFlags);