diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
| commit | 99f7f9a907bd0aa2fc43dc2b192b29ec42330ec7 (patch) | |
| tree | 1f14300a8f95891aff71bf267d5b096d3f8b1ff6 /sql/sql_class.h | |
| parent | 7d0c4cb5c65e4e882ad20e7e317400fa527df9e9 (diff) | |
| parent | 82e2ca0181cdf3682c965ee500dc40472d07b41d (diff) | |
| download | mariadb-git-99f7f9a907bd0aa2fc43dc2b192b29ec42330ec7.tar.gz | |
merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index b23b65dae2f..e348fbc1ad1 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -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 |