archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove version checks for MySQL < 5.0

Browse source
This commit is contained in:
Nikita Popov 2017-07-19 19:34:14 +02:00
parent 296438bfb9
commit 8c1dc840b5
4 changed files with 3 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/mysqli/mysqli.c
View file

@ -568,11 +568,9 @@ PHP_MINIT_FUNCTION(mysqli)
REGISTER_INI_ENTRIES(); REGISTER_INI_ENTRIES();
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
#if MYSQL_VERSION_ID >= 40000
if (mysql_server_init(0, NULL, NULL)) { if (mysql_server_init(0, NULL, NULL)) {
return FAILURE; return FAILURE;
} }
#endif
#endif #endif
memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
@ -691,9 +689,7 @@ PHP_MINIT_FUNCTION(mysqli)
REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT", MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT", MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT);
#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_OPT_READ_TIMEOUT", MYSQL_OPT_READ_TIMEOUT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_READ_TIMEOUT", MYSQL_OPT_READ_TIMEOUT, CONST_CS | CONST_PERSISTENT);
#endif
#if defined(MYSQLI_USE_MYSQLND) #if defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_CMD_BUFFER_SIZE", MYSQLND_OPT_NET_CMD_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_CMD_BUFFER_SIZE", MYSQLND_OPT_NET_CMD_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_READ_BUFFER_SIZE", MYSQLND_OPT_NET_READ_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_READ_BUFFER_SIZE", MYSQLND_OPT_NET_READ_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
@ -885,7 +881,6 @@ PHP_MINIT_FUNCTION(mysqli)
PHP_MSHUTDOWN_FUNCTION(mysqli) PHP_MSHUTDOWN_FUNCTION(mysqli)
{ {
#ifndef MYSQLI_USE_MYSQLND #ifndef MYSQLI_USE_MYSQLND
#if MYSQL_VERSION_ID >= 40000
#ifdef PHP_WIN32 #ifdef PHP_WIN32
zend_ulong client_ver = mysql_get_client_version(); zend_ulong client_ver = mysql_get_client_version();
/* /*
@ -898,7 +893,6 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
#else #else
mysql_server_end(); mysql_server_end();
#endif #endif
#endif
#endif #endif
zend_hash_destroy(&mysqli_driver_properties); zend_hash_destroy(&mysqli_driver_properties);
@ -917,7 +911,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
*/ */
PHP_RINIT_FUNCTION(mysqli) PHP_RINIT_FUNCTION(mysqli)
{ {
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000 #if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
if (mysql_thread_init()) { if (mysql_thread_init()) {
return FAILURE; return FAILURE;
} }
@ -954,7 +948,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
{ {
/* check persistent connections, move used to free */ /* check persistent connections, move used to free */
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000 #if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
mysql_thread_end(); mysql_thread_end();
#endif #endif
if (MyG(error_msg)) { if (MyG(error_msg)) {

2
ext/mysqli/mysqli_api.c
View file

@ -1712,14 +1712,12 @@ static int mysqli_options_get_option_zval_type(int option)
#ifdef MYSQL_OPT_PROTOCOL #ifdef MYSQL_OPT_PROTOCOL
case MYSQL_OPT_PROTOCOL: case MYSQL_OPT_PROTOCOL:
#endif /* MySQL 4.1.0 */ #endif /* MySQL 4.1.0 */
#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND)
case MYSQL_OPT_READ_TIMEOUT: case MYSQL_OPT_READ_TIMEOUT:
case MYSQL_OPT_WRITE_TIMEOUT: case MYSQL_OPT_WRITE_TIMEOUT:
case MYSQL_OPT_GUESS_CONNECTION: case MYSQL_OPT_GUESS_CONNECTION:
case MYSQL_OPT_USE_EMBEDDED_CONNECTION: case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
case MYSQL_OPT_USE_REMOTE_CONNECTION: case MYSQL_OPT_USE_REMOTE_CONNECTION:
case MYSQL_SECURE_AUTH: case MYSQL_SECURE_AUTH:
#endif
#ifdef MYSQL_OPT_RECONNECT #ifdef MYSQL_OPT_RECONNECT
case MYSQL_OPT_RECONNECT: case MYSQL_OPT_RECONNECT:
#endif /* MySQL 5.0.13 */ #endif /* MySQL 5.0.13 */

2
ext/mysqli/mysqli_priv.h
View file

@ -33,7 +33,7 @@
#define HAVE_MYSQLI_GET_CHARSET #define HAVE_MYSQLI_GET_CHARSET
#endif #endif
#if defined(MYSQLND_VERSION_ID) || (MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID > 50005 #if defined(MYSQLND_VERSION_ID) || MYSQL_VERSION_ID > 50005
#define HAVE_MYSQLI_SET_CHARSET #define HAVE_MYSQLI_SET_CHARSET
#endif #endif

34
ext/pdo_mysql/mysql_driver.c
View file

@ -349,11 +349,7 @@ static int mysql_handle_commit(pdo_dbh_t *dbh)
{ {
PDO_DBG_ENTER("mysql_handle_commit"); PDO_DBG_ENTER("mysql_handle_commit");
PDO_DBG_INF_FMT("dbh=%p", dbh); PDO_DBG_INF_FMT("dbh=%p", dbh);
#if MYSQL_VERSION_ID >= 40100 || defined(PDO_USE_MYSQLND)
PDO_DBG_RETURN(0 == mysql_commit(((pdo_mysql_db_handle *)dbh->driver_data)->server)); PDO_DBG_RETURN(0 == mysql_commit(((pdo_mysql_db_handle *)dbh->driver_data)->server));
#else
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("COMMIT")));
#endif
} }
/* }}} */ /* }}} */
@ -362,11 +358,7 @@ static int mysql_handle_rollback(pdo_dbh_t *dbh)
{ {
PDO_DBG_ENTER("mysql_handle_rollback"); PDO_DBG_ENTER("mysql_handle_rollback");
PDO_DBG_INF_FMT("dbh=%p", dbh); PDO_DBG_INF_FMT("dbh=%p", dbh);
#if MYSQL_VERSION_ID >= 40100 || defined(PDO_USE_MYSQLND)
PDO_DBG_RETURN(0 <= mysql_rollback(((pdo_mysql_db_handle *)dbh->driver_data)->server)); PDO_DBG_RETURN(0 <= mysql_rollback(((pdo_mysql_db_handle *)dbh->driver_data)->server));
#else
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("ROLLBACK")));
#endif
} }
/* }}} */ /* }}} */
@ -376,15 +368,7 @@ static inline int mysql_handle_autocommit(pdo_dbh_t *dbh)
PDO_DBG_ENTER("mysql_handle_autocommit"); PDO_DBG_ENTER("mysql_handle_autocommit");
PDO_DBG_INF_FMT("dbh=%p", dbh); PDO_DBG_INF_FMT("dbh=%p", dbh);
PDO_DBG_INF_FMT("dbh->autocommit=%d", dbh->auto_commit); PDO_DBG_INF_FMT("dbh->autocommit=%d", dbh->auto_commit);
#if MYSQL_VERSION_ID >= 40100 || defined(PDO_USE_MYSQLND)
PDO_DBG_RETURN(0 <= mysql_autocommit(((pdo_mysql_db_handle *)dbh->driver_data)->server, dbh->auto_commit)); PDO_DBG_RETURN(0 <= mysql_autocommit(((pdo_mysql_db_handle *)dbh->driver_data)->server, dbh->auto_commit));
#else
if (dbh->auto_commit) {
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("SET AUTOCOMMIT=1")));
} else {
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("SET AUTOCOMMIT=0")));
}
#endif
} }
/* }}} */ /* }}} */
@ -516,31 +500,13 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
static int pdo_mysql_check_liveness(pdo_dbh_t *dbh) static int pdo_mysql_check_liveness(pdo_dbh_t *dbh)
{ {
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data; pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
#if MYSQL_VERSION_ID <= 32230
void (*handler) (int);
unsigned int my_errno;
#endif
PDO_DBG_ENTER("pdo_mysql_check_liveness"); PDO_DBG_ENTER("pdo_mysql_check_liveness");
PDO_DBG_INF_FMT("dbh=%p", dbh); PDO_DBG_INF_FMT("dbh=%p", dbh);
#if MYSQL_VERSION_ID > 32230
if (mysql_ping(H->server)) { if (mysql_ping(H->server)) {
PDO_DBG_RETURN(FAILURE); PDO_DBG_RETURN(FAILURE);
} }
#else /* no mysql_ping() */
handler = signal(SIGPIPE, SIG_IGN);
mysql_stat(H->server);
switch (mysql_errno(H->server)) {
case CR_SERVER_GONE_ERROR:
case CR_SERVER_LOST:
signal(SIGPIPE, handler);
PDO_DBG_RETURN(FAILURE);
default:
break;
}
signal(SIGPIPE, handler);
#endif /* end mysql_ping() */
PDO_DBG_RETURN(SUCCESS); PDO_DBG_RETURN(SUCCESS);
} }
/* }}} */ /* }}} */