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 /sql-common | |
| 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 'sql-common')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 0423b44e26f..e4c4c2ad4a1 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -3292,9 +3292,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, if (mysql->options.extension && mysql->options.extension->async_context) net->vio->async_context= mysql->options.extension->async_context; - if (my_net_init(net, net->vio, - MYF(mysql->options.thread_specific_malloc ? - MY_THREAD_SPECIFIC : 0))) + if (my_net_init(net, net->vio, MYF(0))) { vio_delete(net->vio); net->vio = 0; @@ -4222,9 +4220,6 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) mysql->options.extension->report_progress= (void (*)(const MYSQL *, uint, uint, double, const char *, uint)) arg; break; - case MYSQL_THREAD_SPECIFIC_MALLOC: - mysql->options.thread_specific_malloc= *(uint*) arg; - break; case MYSQL_OPT_NONBLOCK: if (mysql->options.extension && (ctxt = mysql->options.extension->async_context) != 0) |