Skip to content

Commit 38ac5ae

Browse files
committed
Remove MYSQLI_IS_MARIADB constant
1 parent 5bccb64 commit 38ac5ae

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

ext/mysqli/mysqli.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -688,12 +688,6 @@ PHP_MINIT_FUNCTION(mysqli)
688688
REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_RELEASE", TRANS_COR_RELEASE, CONST_CS | CONST_PERSISTENT);
689689
REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_NO_RELEASE", TRANS_COR_NO_RELEASE, CONST_CS | CONST_PERSISTENT);
690690

691-
#ifdef MARIADB_BASE_VERSION
692-
REGISTER_BOOL_CONSTANT("MYSQLI_IS_MARIADB", 1, CONST_CS | CONST_PERSISTENT);
693-
#else
694-
REGISTER_BOOL_CONSTANT("MYSQLI_IS_MARIADB", 0, CONST_CS | CONST_PERSISTENT);
695-
#endif
696-
697691
register_mysqli_symbols(module_number);
698692

699693
mysqlnd_reverse_api_register_api(&mysqli_reverse_api);

ext/mysqli/tests/mysqli_constants.phpt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ $expected_constants = array(
4747
"MYSQLI_GROUP_FLAG" => true,
4848
"MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED"=> true,
4949
"MYSQLI_SERVER_QUERY_NO_INDEX_USED" => true,
50-
"MYSQLI_IS_MARIADB" => true,
50+
"MYSQLI_OPT_LOAD_DATA_LOCAL_DIR" => true,
5151

5252
"MYSQLI_TYPE_DECIMAL" => true,
5353
"MYSQLI_TYPE_TINY" => true,
@@ -181,10 +181,6 @@ if ($IS_MYSQLND) {
181181
$expected_constants["MYSQLI_TYPE_JSON"] = true;
182182
}
183183

184-
if (($version > 80021 && $constants['mysqli']['MYSQLI_IS_MARIADB']) || $IS_MYSQLND) {
185-
$expected_constants['MYSQLI_OPT_LOAD_DATA_LOCAL_DIR'] = true;
186-
}
187-
188184
$unexpected_constants = array();
189185

190186
foreach ($constants as $group => $consts) {

0 commit comments

Comments
 (0)