File tree Expand file tree Collapse file tree 1 file changed +3
-17
lines changed Expand file tree Collapse file tree 1 file changed +3
-17
lines changed Original file line number Diff line number Diff line change @@ -105,15 +105,15 @@ mysqli.allow_local_infile=1
105
105
);
106
106
107
107
/* depends on the build - experimental */
108
- if ($ IS_MYSQLND && defined ( ' MYSQLI_OPT_INT_AND_FLOAT_NATIVE ' ) ) {
108
+ if ($ IS_MYSQLND ) {
109
109
$ expected_constants ['MYSQLI_OPT_INT_AND_FLOAT_NATIVE ' ] = true ;
110
110
}
111
111
112
- if ($ IS_MYSQLND && defined ( ' MYSQLI_STORE_RESULT_COPY_DATA ' ) ) {
112
+ if ($ IS_MYSQLND ) {
113
113
$ expected_constants ['MYSQLI_STORE_RESULT_COPY_DATA ' ] = true ;
114
114
}
115
115
116
- if ($ IS_MYSQLND || defined ( ' MYSQLI_REFRESH_BACKUP_LOG ' ) ) {
116
+ if ($ IS_MYSQLND ) {
117
117
$ expected_constants ['MYSQLI_REFRESH_BACKUP_LOG ' ] = true ;
118
118
}
119
119
@@ -160,22 +160,8 @@ mysqli.allow_local_infile=1
160
160
}
161
161
162
162
/* pretty dump test, but that is the best way to mimic mysql.c */
163
- if (defined ('MYSQLI_DATA_TRUNCATED ' ))
164
163
$ expected_constants ["MYSQLI_DATA_TRUNCATED " ] = true ;
165
164
166
- if (!$ IS_MYSQLND ) {
167
- /* libmysql only */
168
-
169
- /* are they available in all versions of ext/mysqli ?
170
- ... no we must have removed them at some point - for BC, weakening the test
171
- */
172
- if (defined ("MYSQLI_RPL_MASTER " )) {
173
- $ expected_constants ["MYSQLI_RPL_MASTER " ] = true ;
174
- $ expected_constants ["MYSQLI_RPL_SLAVE " ] = true ;
175
- $ expected_constants ["MYSQLI_RPL_ADMIN " ] = true ;
176
- }
177
- }
178
-
179
165
if ($ IS_MYSQLND || (!$ IS_MYSQLND && ($ version > 50610 ))) {
180
166
/* could be that MySQL/libmysql 5.6.9 had the flag already but it was no stable release */
181
167
$ expected_constants ["MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS " ] = true ;
You can’t perform that action at this time.
0 commit comments