Skip to content

Commit 86e7aa2

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Remove bogus REGISTER_LONG_CONSTANT
2 parents 5dd1877 + 0630820 commit 86e7aa2

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
@@ -1714,16 +1714,13 @@ static int mysqli_options_get_option_zval_type(int option)
17141714
#ifdef MYSQL_OPT_COMPRESS
17151715
case MYSQL_OPT_COMPRESS:
17161716
#endif /* mysqlnd @ PHP 5.3.2 */
1717-
#ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT
1718-
REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
1719-
#endif /* MySQL 5.1.1., mysqlnd @ PHP 5.3.3 */
17201717
#if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND)
17211718
case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
17221719
#endif
17231720
return IS_LONG;
17241721

17251722
#ifdef MYSQL_SHARED_MEMORY_BASE_NAME
1726-
case MYSQL_SHARED_MEMORY_BASE_NAME:
1723+
case MYSQL_SHARED_MEMORY_BASE_NAME:
17271724
#endif /* MySQL 4.1.0 */
17281725
#ifdef MYSQL_SET_CLIENT_IP
17291726
case MYSQL_SET_CLIENT_IP:

0 commit comments

Comments
 (0)