diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-05-10 18:17:43 +0300 |
| commit | ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59 (patch) | |
| tree | d7eed818fd8b648e5eabe0dbad53e61665d8dc37 /sql/mysql_priv.h | |
| parent | 355e250544e69df7b547d8950bc9febfc5668be6 (diff) | |
| parent | 82b49178600e3b21f378bef71b8f9e81bc7bcd3a (diff) | |
| download | mariadb-git-ce3b7273a6b5b5bf3dc4a0f3c72ef9889d091f59.tar.gz | |
Merge with MariaDB 5.2
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 4cbb3251742..94e44aad93b 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -980,14 +980,14 @@ struct Query_cache_query_flags (((L)->sql_command == SQLCOM_SELECT) && (L)->safe_to_cache_query) #else #define QUERY_CACHE_FLAGS_SIZE 0 -#define query_cache_store_query(A, B) -#define query_cache_destroy() -#define query_cache_result_size_limit(A) -#define query_cache_init() -#define query_cache_resize(A) -#define query_cache_set_min_res_unit(A) -#define query_cache_invalidate3(A, B, C) -#define query_cache_invalidate1(A) +#define query_cache_store_query(A, B) do { } while(0) +#define query_cache_destroy() do { } while(0) +#define query_cache_result_size_limit(A) do { } while(0) +#define query_cache_init() do { } while(0) +#define query_cache_resize(A) do { } while(0) +#define query_cache_set_min_res_unit(A) do { } while(0) +#define query_cache_invalidate3(A, B, C) do { } while(0) +#define query_cache_invalidate1(A) do { } while(0) #define query_cache_send_result_to_client(A, B, C) 0 #define query_cache_invalidate_by_MyISAM_filename_ref NULL @@ -1101,7 +1101,11 @@ void reset_mqh(LEX_USER *lu, bool get_them); bool check_mqh(THD *thd, uint check_command); void time_out_user_resource_limits(THD *thd, USER_CONN *uc); void decrease_user_connections(USER_CONN *uc); -void thd_init_client_charset(THD *thd, uint cs_number); +bool thd_init_client_charset(THD *thd, uint cs_number); +inline bool is_supported_parser_charset(CHARSET_INFO *cs) +{ + return test(cs->mbminlen == 1); +} bool setup_connection_thread_globals(THD *thd); bool login_connection(THD *thd); void end_connection(THD *thd); @@ -2074,6 +2078,7 @@ extern my_bool relay_log_purge, opt_innodb_safe_binlog, opt_innodb; extern uint test_flags,select_errors,ha_open_options; extern uint protocol_version, mysqld_port, mysqld_extra_port, dropping_tables; extern uint delay_key_write_options; +extern ulong max_long_data_size; #endif /* MYSQL_SERVER */ #if defined MYSQL_SERVER || defined INNODB_COMPATIBILITY_HOOKS extern MYSQL_PLUGIN_IMPORT uint lower_case_table_names; |