Skip to content

Commit 055fa41

Browse files
committed
Revert "Remove MYSQLI_ON_UPDATE_NOW_FLAG"
This reverts commit 4e0ebe4.
1 parent 2e695c4 commit 055fa41

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

ext/mysqli/mysqli.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -681,6 +681,10 @@ PHP_MINIT_FUNCTION(mysqli)
681681
REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS | CONST_PERSISTENT);
682682
REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG", NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
683683

684+
#if MYSQL_VERSION_ID < 60000 || MYSQL_VERSION_ID > 60003 || defined(MYSQLI_USE_MYSQLND)
685+
REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT);
686+
#endif
687+
684688
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DECIMAL", FIELD_TYPE_DECIMAL, CONST_CS | CONST_PERSISTENT);
685689
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TINY", FIELD_TYPE_TINY, CONST_CS | CONST_PERSISTENT);
686690
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_SHORT", FIELD_TYPE_SHORT, CONST_CS | CONST_PERSISTENT);

ext/mysqli/tests/mysqli_constants.phpt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@ mysqli.allow_local_infile=1
125125
$version = mysqli_get_client_version();
126126
}
127127

128+
if (($version > 51122 && $version < 60000) || ($version > 60003) || $IS_MYSQLND) {
129+
$expected_constants['MYSQLI_ON_UPDATE_NOW_FLAG'] = true;
130+
}
131+
128132
$expected_constants['MYSQLI_CLIENT_SSL_VERIFY_SERVER_CERT'] = true;
129133
if ($IS_MYSQLND) {
130134
$expected_constants['MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'] = true;

0 commit comments

Comments
 (0)