diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-16 09:18:22 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-01-16 09:18:22 +0000 |
| commit | da27dc995ee407cb56761393bc5dcdd48456d851 (patch) | |
| tree | 6e8dfa78e8af57b012b56ea2f534011e9c657533 | |
| parent | 0664d633e415d04a90f343dbaf954ae756a474b3 (diff) | |
| download | mariadb-git-da27dc995ee407cb56761393bc5dcdd48456d851.tar.gz | |
Fix Windows build
| -rw-r--r-- | sql/rpl_gtid.cc | 2 | ||||
| -rw-r--r-- | sql/set_var.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 9f48f908102..78e6165a551 100644 --- 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 index 311b33bc0dd..097124a0b3a 100644 --- 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 index 8747d658aea..bb957e9ea20 100644 --- 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; |