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

Fix Windows build

Browse Source
This commit is contained in:
Vladislav Vaintroub
2018-01-16 09:18:22 +00:00
parent 0664d633e4
commit da27dc995e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/rpl_gtid.cc
View File

@ -582,7 +582,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id,
bool table_opened= false; bool table_opened= false;
TABLE *table; TABLE *table;
list_element *delete_list= 0, *next, *cur, **next_ptr_ptr, **best_ptr_ptr; list_element *delete_list= 0, *next, *cur, **next_ptr_ptr, **best_ptr_ptr;
uint64_t best_sub_id; uint64 best_sub_id;
element *elem; element *elem;
ulonglong thd_saved_option= thd->variables.option_bits; ulonglong thd_saved_option= thd->variables.option_bits;
Query_tables_list lex_backup; Query_tables_list lex_backup;

2
sql/set_var.cc
View File

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

2
sql/sql_class.h
View File

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