Skip to content

Commit 8c1dc84

Browse files
nikicnikic
committed
Remove version checks for MySQL < 5.0
1 parent 296438b commit 8c1dc84

File tree

4 files changed

+3
-45
lines changed

4 files changed

+3
-45
lines changed

‎ext/mysqli/mysqli.c

+2-8
Original file line numberDiff line numberDiff line change
@@ -568,11 +568,9 @@ PHP_MINIT_FUNCTION(mysqli)
568568

569569
REGISTER_INI_ENTRIES();
570570
#ifndef MYSQLI_USE_MYSQLND
571-
#if MYSQL_VERSION_ID >= 40000
572571
if (mysql_server_init(0, NULL, NULL)) {
573572
return FAILURE;
574573
}
575-
#endif
576574
#endif
577575

578576
memcpy(&mysqli_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
@@ -691,9 +689,7 @@ PHP_MINIT_FUNCTION(mysqli)
691689
REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT", MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT);
692690
REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
693691
REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT);
694-
#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND)
695692
REGISTER_LONG_CONSTANT("MYSQLI_OPT_READ_TIMEOUT", MYSQL_OPT_READ_TIMEOUT, CONST_CS | CONST_PERSISTENT);
696-
#endif
697693
#if defined(MYSQLI_USE_MYSQLND)
698694
REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_CMD_BUFFER_SIZE", MYSQLND_OPT_NET_CMD_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
699695
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)
885881
PHP_MSHUTDOWN_FUNCTION(mysqli)
886882
{
887883
#ifndef MYSQLI_USE_MYSQLND
888-
#if MYSQL_VERSION_ID >= 40000
889884
#ifdef PHP_WIN32
890885
zend_ulong client_ver = mysql_get_client_version();
891886
/*
@@ -898,7 +893,6 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
898893
#else
899894
mysql_server_end();
900895
#endif
901-
#endif
902896
#endif
903897

904898
zend_hash_destroy(&mysqli_driver_properties);
@@ -917,7 +911,7 @@ PHP_MSHUTDOWN_FUNCTION(mysqli)
917911
*/
918912
PHP_RINIT_FUNCTION(mysqli)
919913
{
920-
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
914+
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
921915
if (mysql_thread_init()) {
922916
return FAILURE;
923917
}
@@ -954,7 +948,7 @@ PHP_RSHUTDOWN_FUNCTION(mysqli)
954948
{
955949
/* check persistent connections, move used to free */
956950

957-
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
951+
#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS)
958952
mysql_thread_end();
959953
#endif
960954
if (MyG(error_msg)) {

‎ext/mysqli/mysqli_api.c

-2
Original file line numberDiff line numberDiff line change
@@ -1712,14 +1712,12 @@ static int mysqli_options_get_option_zval_type(int option)
17121712
#ifdef MYSQL_OPT_PROTOCOL
17131713
case MYSQL_OPT_PROTOCOL:
17141714
#endif /* MySQL 4.1.0 */
1715-
#if MYSQL_VERSION_ID > 40101 || defined(MYSQLI_USE_MYSQLND)
17161715
case MYSQL_OPT_READ_TIMEOUT:
17171716
case MYSQL_OPT_WRITE_TIMEOUT:
17181717
case MYSQL_OPT_GUESS_CONNECTION:
17191718
case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
17201719
case MYSQL_OPT_USE_REMOTE_CONNECTION:
17211720
case MYSQL_SECURE_AUTH:
1722-
#endif
17231721
#ifdef MYSQL_OPT_RECONNECT
17241722
case MYSQL_OPT_RECONNECT:
17251723
#endif /* MySQL 5.0.13 */

‎ext/mysqli/mysqli_priv.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define HAVE_MYSQLI_GET_CHARSET
3434
#endif
3535

36-
#if defined(MYSQLND_VERSION_ID) || (MYSQL_VERSION_ID > 40112 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID > 50005
36+
#if defined(MYSQLND_VERSION_ID) || MYSQL_VERSION_ID > 50005
3737
#define HAVE_MYSQLI_SET_CHARSET
3838
#endif
3939

‎ext/pdo_mysql/mysql_driver.c

-34
Original file line numberDiff line numberDiff line change
@@ -349,11 +349,7 @@ static int mysql_handle_commit(pdo_dbh_t *dbh)
349349
{
350350
PDO_DBG_ENTER("mysql_handle_commit");
351351
PDO_DBG_INF_FMT("dbh=%p", dbh);
352-
#if MYSQL_VERSION_ID >= 40100 || defined(PDO_USE_MYSQLND)
353352
PDO_DBG_RETURN(0 == mysql_commit(((pdo_mysql_db_handle *)dbh->driver_data)->server));
354-
#else
355-
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("COMMIT")));
356-
#endif
357353
}
358354
/* }}} */
359355

@@ -362,11 +358,7 @@ static int mysql_handle_rollback(pdo_dbh_t *dbh)
362358
{
363359
PDO_DBG_ENTER("mysql_handle_rollback");
364360
PDO_DBG_INF_FMT("dbh=%p", dbh);
365-
#if MYSQL_VERSION_ID >= 40100 || defined(PDO_USE_MYSQLND)
366361
PDO_DBG_RETURN(0 <= mysql_rollback(((pdo_mysql_db_handle *)dbh->driver_data)->server));
367-
#else
368-
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("ROLLBACK")));
369-
#endif
370362
}
371363
/* }}} */
372364

@@ -376,15 +368,7 @@ static inline int mysql_handle_autocommit(pdo_dbh_t *dbh)
376368
PDO_DBG_ENTER("mysql_handle_autocommit");
377369
PDO_DBG_INF_FMT("dbh=%p", dbh);
378370
PDO_DBG_INF_FMT("dbh->autocommit=%d", dbh->auto_commit);
379-
#if MYSQL_VERSION_ID >= 40100 || defined(PDO_USE_MYSQLND)
380371
PDO_DBG_RETURN(0 <= mysql_autocommit(((pdo_mysql_db_handle *)dbh->driver_data)->server, dbh->auto_commit));
381-
#else
382-
if (dbh->auto_commit) {
383-
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("SET AUTOCOMMIT=1")));
384-
} else {
385-
PDO_DBG_RETURN(0 <= mysql_handle_doer(dbh, ZEND_STRL("SET AUTOCOMMIT=0")));
386-
}
387-
#endif
388372
}
389373
/* }}} */
390374

@@ -516,31 +500,13 @@ static int pdo_mysql_get_attribute(pdo_dbh_t *dbh, zend_long attr, zval *return_
516500
static int pdo_mysql_check_liveness(pdo_dbh_t *dbh)
517501
{
518502
pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
519-
#if MYSQL_VERSION_ID <= 32230
520-
void (*handler) (int);
521-
unsigned int my_errno;
522-
#endif
523503

524504
PDO_DBG_ENTER("pdo_mysql_check_liveness");
525505
PDO_DBG_INF_FMT("dbh=%p", dbh);
526506

527-
#if MYSQL_VERSION_ID > 32230
528507
if (mysql_ping(H->server)) {
529508
PDO_DBG_RETURN(FAILURE);
530509
}
531-
#else /* no mysql_ping() */
532-
handler = signal(SIGPIPE, SIG_IGN);
533-
mysql_stat(H->server);
534-
switch (mysql_errno(H->server)) {
535-
case CR_SERVER_GONE_ERROR:
536-
case CR_SERVER_LOST:
537-
signal(SIGPIPE, handler);
538-
PDO_DBG_RETURN(FAILURE);
539-
default:
540-
break;
541-
}
542-
signal(SIGPIPE, handler);
543-
#endif /* end mysql_ping() */
544510
PDO_DBG_RETURN(SUCCESS);
545511
}
546512
/* }}} */

0 commit comments

Comments
 (0)