Remove version checks for MySQL < 5.0

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 00a9497fcab31adea24cd7f403750bae5367283d..5278b8a7e17188a75d1afec2078de1d55f406ff0 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -568,11 +568,9 @@ PHP_MINIT_FUNCTION(mysqli)
 
        REGISTER_INI_ENTRIES();
 #ifndef MYSQLI_USE_MYSQLND
-#if MYSQL_VERSION_ID >= 40000
        if (mysql_server_init(0, NULL, NULL)) {
                return FAILURE;
        }
-#endif
 #endif
 
        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_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, 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);
-#endif
 #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_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)
 {
 #ifndef MYSQLI_USE_MYSQLND
-#if MYSQL_VERSION_ID >= 40000
 #ifdef PHP_WIN32
        zend_ulong client_ver = mysql_get_client_version();
        /*
@@ -898,7 +893,6 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
 #else
        mysql_server_end();
 #endif
-#endif
 #endif
 
        zend_hash_destroy(&mysqli_driver_properties);
@@ -917,7 +911,7 @@ PHP_MSHUTDOWN_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()) {
                return FAILURE;
        }
@@ -954,7 +948,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
 {
        /* 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();
 #endif
        if (MyG(error_msg)) {

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 03a39d7e2eacb30319babef3f8ed15c9420fcc1b..9d523aecdafef96267f95ea2fed2c7f4ec69188b 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1712,14 +1712,12 @@ static int mysqli_options_get_option_zval_type(int option)
 #ifdef MYSQL_OPT_PROTOCOL
                 case MYSQL_OPT_PROTOCOL:
 #endif /* MySQL 4.1.0 */
-#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
 #ifdef MYSQL_OPT_RECONNECT
                case MYSQL_OPT_RECONNECT:
 #endif /* MySQL 5.0.13 */

diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h
index 34c7a74779b312a668ca8451b58c4ccb6e7259e8..cd9a8081ec51303321aacc6d265da5a6201721e8 100644 (file)
--- a/ext/mysqli/mysqli_priv.h
+++ b/ext/mysqli/mysqli_priv.h
@@ -33,7 +33,7 @@
 #define HAVE_MYSQLI_GET_CHARSET
 #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
 #endif
 

diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index de6b1b6d32285a719314ecda817ec45e1a539775..ec7d5b8ea72a6b1cb1dd8a634305984b6cf2ace5 100644 (file)
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -349,11 +349,7 @@ static int mysql_handle_commit(pdo_dbh_t *dbh)
 {
        PDO_DBG_ENTER("mysql_handle_commit");
        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));
-#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_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));
-#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_INF_FMT("dbh=%p", dbh);
        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));
-#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)
 {
        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_INF_FMT("dbh=%p", dbh);
 
-#if MYSQL_VERSION_ID > 32230
        if (mysql_ping(H->server)) {
                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);
 }
 /* }}} */