bzr commit into mysql-5.6-next-mr branch (mikael:2926) WL#5138

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/mysql-next-mr-WL5138/ based on revid:mikael@stripped

 2926 Mikael Ronstrom	2009-11-20
      WL#5138, reverted some review fixes

    modified:
      sql/mysql_priv.h
      sql/mysqld.cc
=== modified file 'sql/mysql_priv.h'
--- a/sql/mysql_priv.h	2009-11-20 15:43:21 +0000
+++ b/sql/mysql_priv.h	2009-11-20 17:42:15 +0000
@@ -86,9 +86,9 @@ typedef ulong nesting_map;  /* Used for 
 typedef ulonglong nested_join_map;
 
 /* query_id */
-typedef uint64 query_id_t;
+typedef int64 query_id_t;
 extern query_id_t global_query_id;
-extern uint32 thread_running;
+extern int32 thread_running;
 extern my_atomic_rwlock_t global_query_id_lock;
 
 /* increment query_id and return it.  */

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-11-20 15:43:21 +0000
+++ b/sql/mysqld.cc	2009-11-20 17:42:15 +0000
@@ -532,7 +532,7 @@ uint delay_key_write_options, protocol_v
 uint lower_case_table_names;
 uint tc_heuristic_recover= 0;
 uint volatile thread_count;
-uint32 thread_running;
+int32 thread_running;
 ulonglong thd_startup_options;
 ulong back_log, connect_timeout, concurrency, server_id;
 ulong table_cache_size, table_def_size;


Attachment: [text/bzr-bundle] bzr/[e-mail]