Commit 0e613ab8 authored by Mikael Ronstrom's avatar Mikael Ronstrom

WL#5138, reverted some review fixes

parent c9442b67
...@@ -86,9 +86,9 @@ typedef ulong nesting_map; /* Used for flags of nesting constructs */ ...@@ -86,9 +86,9 @@ typedef ulong nesting_map; /* Used for flags of nesting constructs */
typedef ulonglong nested_join_map; typedef ulonglong nested_join_map;
/* query_id */ /* query_id */
typedef uint64 query_id_t; typedef int64 query_id_t;
extern query_id_t global_query_id; extern query_id_t global_query_id;
extern uint32 thread_running; extern int32 thread_running;
extern my_atomic_rwlock_t global_query_id_lock; extern my_atomic_rwlock_t global_query_id_lock;
/* increment query_id and return it. */ /* increment query_id and return it. */
......
...@@ -532,7 +532,7 @@ uint delay_key_write_options, protocol_version; ...@@ -532,7 +532,7 @@ uint delay_key_write_options, protocol_version;
uint lower_case_table_names; uint lower_case_table_names;
uint tc_heuristic_recover= 0; uint tc_heuristic_recover= 0;
uint volatile thread_count; uint volatile thread_count;
uint32 thread_running; int32 thread_running;
ulonglong thd_startup_options; ulonglong thd_startup_options;
ulong back_log, connect_timeout, concurrency, server_id; ulong back_log, connect_timeout, concurrency, server_id;
ulong table_cache_size, table_def_size; ulong table_cache_size, table_def_size;
......
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