mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
merge
This commit is contained in:
@ -114,7 +114,7 @@ extern bool volatile shutdown_in_progress;
|
||||
|
||||
#define TC_HEURISTIC_RECOVER_COMMIT 1
|
||||
#define TC_HEURISTIC_RECOVER_ROLLBACK 2
|
||||
extern uint tc_heuristic_recover;
|
||||
extern ulong tc_heuristic_recover;
|
||||
|
||||
typedef struct st_user_var_events
|
||||
{
|
||||
@ -426,13 +426,13 @@ typedef struct system_variables
|
||||
ulong log_warnings;
|
||||
ulong group_concat_max_len;
|
||||
|
||||
uint binlog_format; ///< binlog format for this thd (see enum_binlog_format)
|
||||
ulong binlog_format; ///< binlog format for this thd (see enum_binlog_format)
|
||||
my_bool binlog_direct_non_trans_update;
|
||||
my_bool sql_log_bin;
|
||||
uint completion_type;
|
||||
uint query_cache_type;
|
||||
uint tx_isolation;
|
||||
uint updatable_views_with_limit;
|
||||
ulong completion_type;
|
||||
ulong query_cache_type;
|
||||
ulong tx_isolation;
|
||||
ulong updatable_views_with_limit;
|
||||
uint max_user_connections;
|
||||
/**
|
||||
In slave thread we need to know in behalf of which
|
||||
|
Reference in New Issue
Block a user