diff options
| author | Andrey Hristov <andrey@php.net> | 2010-08-09 17:01:57 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2010-08-09 17:01:57 +0000 |
| commit | f8c26805091a68b3bbc50e0e30b17a1a45b58bb6 (patch) | |
| tree | 4364f4c234407f3ab0ef2cc2588dc9a01ca236af /ext/mysqlnd/mysqlnd.c | |
| parent | cf7d0fb4e78982dd274cc94a57810f88de18d128 (diff) | |
| download | php-git-f8c26805091a68b3bbc50e0e30b17a1a45b58bb6.tar.gz | |
Lay foundations for named pipe support in mysqlnd
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index a192746bd5..9d4d219204 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2116,10 +2116,17 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn, DBG_INF_FMT("charset=%s", conn->options.charset_name); break; } + case MYSQL_OPT_NAMED_PIPE: + conn->options.protocol = MYSQL_PROTOCOL_PIPE; + break; + case MYSQL_OPT_PROTOCOL: + if (*(unsigned int*) value < MYSQL_PROTOCOL_LAST) { + conn->options.protocol = *(unsigned int*) value; + } + break; #ifdef WHEN_SUPPORTED_BY_MYSQLI case MYSQL_SET_CHARSET_DIR: case MYSQL_OPT_RECONNECT: - case MYSQL_OPT_PROTOCOL: /* we don't need external character sets, all character sets are compiled in. For compatibility we just ignore this setting. Same for protocol, we don't support old protocol */ @@ -2131,7 +2138,6 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn, #endif #ifdef WHEN_SUPPORTED_BY_MYSQLI - case MYSQL_OPT_NAMED_PIPE: case MYSQL_SHARED_MEMORY_BASE_NAME: case MYSQL_OPT_USE_RESULT: case MYSQL_SECURE_AUTH: |