Fix Windows build

MariaDB · Jan 16, 2018 · da27dc9 · da27dc9
1 parent 0664d63
commit da27dc9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
@@ -582,7 +582,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id,
   bool table_opened= false;
   TABLE *table;
   list_element *delete_list= 0, *next, *cur, **next_ptr_ptr, **best_ptr_ptr;
-  uint64_t best_sub_id;
+  uint64 best_sub_id;
   element *elem;
   ulonglong thd_saved_option= thd->variables.option_bits;
   Query_tables_list lex_backup;

diff --git a/sql/set_var.cc b/sql/set_var.cc
@@ -1323,7 +1323,7 @@ resolve_engine_list_item(THD *thd, plugin_ref *list, uint32 *idx,
 {
   LEX_CSTRING item_str;
   plugin_ref ref;
-  uint32_t i;
+  uint32 i;
   THD *thd_or_null = (temp_copy ? thd : NULL);
 
   item_str.str= pos;

diff --git a/sql/sql_class.h b/sql/sql_class.h
@@ -833,7 +833,7 @@ typedef struct system_status_var
   ulonglong table_open_cache_overflows;
   double last_query_cost;
   double cpu_time, busy_time;
-  uint32_t threads_running;
+  uint32 threads_running;
   /* Don't initialize */
   /* Memory used for thread local storage */
   int64 max_local_memory_used;