diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:19:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:19:37 +0100 |
| commit | 52051882002c1b88a427d50fb343a9ed3614ffe0 (patch) | |
| tree | 6da97d315d36c2a8a557a3227612c3aaf9aabee1 /include/mysql.h.pp | |
| parent | e3f08e7e0bbc56cd401bb1031827571498c15904 (diff) | |
| download | mariadb-git-52051882002c1b88a427d50fb343a9ed3614ffe0.tar.gz | |
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
Diffstat (limited to 'include/mysql.h.pp')
| -rw-r--r-- | include/mysql.h.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 84510a69edb..331183180c0 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -262,7 +262,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, MYSQL_OPT_NONBLOCK=6000 }; struct st_mysql_options_extention; @@ -282,7 +282,7 @@ struct st_mysql_options { unsigned long max_allowed_packet; my_bool use_ssl; my_bool compress,named_pipe; - my_bool thread_specific_malloc; + my_bool unused1; my_bool unused2; my_bool unused3; my_bool unused4; |