database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix to make os_thread_id it compiled on windows.

Browse Source
This commit is contained in:
Oleksandr Byelkin
2015-09-20 20:22:22 +02:00
parent d39a2f7d11
commit f727fb45d4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -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

2
sql/sql_class.h
View File

@ -2630,7 +2630,7 @@ public:
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;

2
sql/sql_show.cc
View File

@ -2334,7 +2334,7 @@ public:
{ 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;