From 52051882002c1b88a427d50fb343a9ed3614ffe0 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 23 Jan 2013 16:19:37 +0100 Subject: cleanup: * remove unused mysql_option * don't allocate 5GB of memory in the mtr tests * restore the behavior in dynamic_column_offset_byte(), put the ifdef correctly * prefer __attribute__((unused)) to #ifdef * prefer UNINIT_VAR to LINT_INIT * make most Warning_info users blissfully unaware of the postponed initialization * use my_offsetof instead of offsetof where the compiler thinks the latter is incorrect --- include/mysql.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/mysql.h') diff --git a/include/mysql.h b/include/mysql.h index 1268280395e..fa62026b44a 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -167,7 +167,7 @@ enum mysql_option MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, - MYSQL_PROGRESS_CALLBACK, MYSQL_THREAD_SPECIFIC_MALLOC, + MYSQL_PROGRESS_CALLBACK, /* MariaDB options */ MYSQL_OPT_NONBLOCK=6000 }; @@ -194,7 +194,7 @@ struct st_mysql_options { unsigned long max_allowed_packet; my_bool use_ssl; /* if to use SSL or not */ my_bool compress,named_pipe; - my_bool thread_specific_malloc; + my_bool unused1; my_bool unused2; my_bool unused3; my_bool unused4; -- cgit v1.2.1