Commit f727fb45 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Fix to make os_thread_id it compiled on windows.

parent d39a2f7d
...@@ -2073,7 +2073,7 @@ bool THD::store_globals() ...@@ -2073,7 +2073,7 @@ bool THD::store_globals()
*/ */
mysys_var->id= thread_id; mysys_var->id= thread_id;
#ifdef __NR_gettid #ifdef __NR_gettid
os_thread_id= syscall(__NR_gettid); os_thread_id= (uint32)syscall(__NR_gettid);
#else #else
os_thread_id= 0; os_thread_id= 0;
#endif #endif
......
...@@ -2630,7 +2630,7 @@ class THD :public Statement, ...@@ -2630,7 +2630,7 @@ class THD :public Statement,
ulong query_plan_fsort_passes; ulong query_plan_fsort_passes;
pthread_t real_id; /* For debugging */ pthread_t real_id; /* For debugging */
my_thread_id thread_id; my_thread_id thread_id;
pid_t os_thread_id; uint32 os_thread_id;
uint tmp_table, global_disable_checkpoint; uint tmp_table, global_disable_checkpoint;
uint server_status,open_options; uint server_status,open_options;
enum enum_thread_type system_thread; enum enum_thread_type system_thread;
......
...@@ -2334,7 +2334,7 @@ class thread_info :public ilink { ...@@ -2334,7 +2334,7 @@ class thread_info :public ilink {
{ TRASH(ptr, size); } { TRASH(ptr, size); }
ulong thread_id; ulong thread_id;
ulong os_thread_id; uint32 os_thread_id;
ulonglong start_time; ulonglong start_time;
uint command; uint command;
const char *user,*host,*db,*proc_info,*state_info; const char *user,*host,*db,*proc_info,*state_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment