diff options
| author | Andrey Hristov <andrey.hristov@dnhsoft.com> | 2016-10-17 18:58:14 +0300 |
|---|---|---|
| committer | Andrey Hristov <andrey.hristov@dnhsoft.com> | 2016-10-17 18:58:14 +0300 |
| commit | 9594e364ed49d575dc27b887a996af10d18577ce (patch) | |
| tree | 676d6c067d743ff8f715adfbac15a674bbbbb323 /ext/mysqli/mysqli_api.c | |
| parent | e1f5b6d8dfe1543205d5b45d3dcf1d34f5e2e420 (diff) | |
| download | php-git-9594e364ed49d575dc27b887a996af10d18577ce.tar.gz | |
This is a very very old thing dated back to year 2009.
MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 4f66069e41..b8068201b1 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1759,14 +1759,14 @@ static int mysqli_options_get_option_zval_type(int option) #ifdef MYSQL_OPT_PROTOCOL case MYSQL_OPT_PROTOCOL: #endif /* MySQL 4.1.0 */ -#ifdef MYSQL_OPT_READ_TIMEOUT +#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND) case MYSQL_OPT_READ_TIMEOUT: case MYSQL_OPT_WRITE_TIMEOUT: case MYSQL_OPT_GUESS_CONNECTION: case MYSQL_OPT_USE_EMBEDDED_CONNECTION: case MYSQL_OPT_USE_REMOTE_CONNECTION: case MYSQL_SECURE_AUTH: -#endif /* MySQL 4.1.1 */ +#endif #ifdef MYSQL_OPT_RECONNECT case MYSQL_OPT_RECONNECT: #endif /* MySQL 5.0.13 */ |