File tree Expand file tree Collapse file tree 2 files changed +1
-11
lines changed Expand file tree Collapse file tree 2 files changed +1
-11
lines changed Original file line number Diff line number Diff line change @@ -688,12 +688,6 @@ PHP_MINIT_FUNCTION(mysqli)
688
688
REGISTER_LONG_CONSTANT ("MYSQLI_TRANS_COR_RELEASE" , TRANS_COR_RELEASE , CONST_CS | CONST_PERSISTENT );
689
689
REGISTER_LONG_CONSTANT ("MYSQLI_TRANS_COR_NO_RELEASE" , TRANS_COR_NO_RELEASE , CONST_CS | CONST_PERSISTENT );
690
690
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
-
697
691
register_mysqli_symbols (module_number );
698
692
699
693
mysqlnd_reverse_api_register_api (& mysqli_reverse_api );
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ $expected_constants = array(
47
47
"MYSQLI_GROUP_FLAG " => true ,
48
48
"MYSQLI_SERVER_QUERY_NO_GOOD_INDEX_USED " => true ,
49
49
"MYSQLI_SERVER_QUERY_NO_INDEX_USED " => true ,
50
- "MYSQLI_IS_MARIADB " => true ,
50
+ "MYSQLI_OPT_LOAD_DATA_LOCAL_DIR " => true ,
51
51
52
52
"MYSQLI_TYPE_DECIMAL " => true ,
53
53
"MYSQLI_TYPE_TINY " => true ,
@@ -181,10 +181,6 @@ if ($IS_MYSQLND) {
181
181
$ expected_constants ["MYSQLI_TYPE_JSON " ] = true ;
182
182
}
183
183
184
- if (($ version > 80021 && $ constants ['mysqli ' ]['MYSQLI_IS_MARIADB ' ]) || $ IS_MYSQLND ) {
185
- $ expected_constants ['MYSQLI_OPT_LOAD_DATA_LOCAL_DIR ' ] = true ;
186
- }
187
-
188
184
$ unexpected_constants = array ();
189
185
190
186
foreach ($ constants as $ group => $ consts ) {
You can’t perform that action at this time.
0 commit comments