diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-18 11:48:38 +0400 |
| commit | e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e (patch) | |
| tree | ca30b82c7f6cd44e80283058f48c8e2d0603e3c5 /sql/sql_class.h | |
| parent | 932285774ba4ad10c199953d47fc0f688fd12c10 (diff) | |
| parent | 8c4d4cc3a6f1fd9852e11e16926a5e98cca5ee03 (diff) | |
| download | mariadb-git-e28d6ee66a8404dd0f8fe3aaabb9d72544e5d42e.tar.gz | |
Auto-merge from mysql-5.5.
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 052537e521f..462fbf9a264 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 |