Skip to content

Commit 4a98b64

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Remove bogus REGISTER_LONG_CONSTANT
2 parents 9f05c32 + 86e7aa2 commit 4a98b64

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

ext/mysqli/mysqli_api.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,16 +1644,13 @@ static int mysqli_options_get_option_zval_type(int option)
16441644
#ifdef MYSQL_OPT_COMPRESS
16451645
case MYSQL_OPT_COMPRESS:
16461646
#endif /* mysqlnd @ PHP 5.3.2 */
1647-
#ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT
1648-
REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
1649-
#endif /* MySQL 5.1.1., mysqlnd @ PHP 5.3.3 */
16501647
#if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND)
16511648
case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
16521649
#endif
16531650
return IS_LONG;
16541651

16551652
#ifdef MYSQL_SHARED_MEMORY_BASE_NAME
1656-
case MYSQL_SHARED_MEMORY_BASE_NAME:
1653+
case MYSQL_SHARED_MEMORY_BASE_NAME:
16571654
#endif /* MySQL 4.1.0 */
16581655
#ifdef MYSQL_SET_CLIENT_IP
16591656
case MYSQL_SET_CLIENT_IP:

0 commit comments

Comments
 (0)