summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2009-06-17 16:14:08 +0200
committerVladislav Vaintroub <vvaintroub@mysql.com>2009-06-17 16:14:08 +0200
commitbe7c2fa141186db0f93fff268b3f565bd293e405 (patch)
tree052593480370133bd182c3bdefee9e0b3a4e8ad0 /storage
parent31b79618e34a36ff24d2e1a6186258dc18e12aa5 (diff)
downloadmariadb-git-be7c2fa141186db0f93fff268b3f565bd293e405.tar.gz
Fixed type defintion for os_thread_id_t on 64 bit Windows.
It used to be declared as ulint, which is 32/64 bit integer depending on OS bitness. However this declaration lead to problems with os_compare_and_swap_thread_id implementation which operated on 32 bit integers (InterlockedCompareExchange) Using 64 bit int lead to wrong result in os_compare_and_swap_thread_id and to crash/assertion in rw_lock_set_writer_id_and_recursion_flag() The fix is to use 4 byte integer to os_thread_id type definition.
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/include/os0thread.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innodb_plugin/include/os0thread.h b/storage/innodb_plugin/include/os0thread.h
index 14f10fd5427..def5853b189 100644
--- a/storage/innodb_plugin/include/os0thread.h
+++ b/storage/innodb_plugin/include/os0thread.h
@@ -44,7 +44,7 @@ can wait inside InnoDB */
#ifdef __WIN__
typedef void* os_thread_t;
-typedef ulint os_thread_id_t; /*!< In Windows the thread id
+typedef unsigned long os_thread_id_t; /*!< In Windows the thread id
is an unsigned long int */
#else
typedef pthread_t os_thread_t;