Skip to content

Commit ea27d99

Browse files
committed
Remove mysqli_driver::$reconnect property
1 parent 4320873 commit ea27d99

File tree

5 files changed

+1
-29
lines changed

5 files changed

+1
-29
lines changed

ext/mysqli/mysqli.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,6 @@ static PHP_GINIT_FUNCTION(mysqli)
461461
mysqli_globals->default_user = NULL;
462462
mysqli_globals->default_pw = NULL;
463463
mysqli_globals->default_socket = NULL;
464-
mysqli_globals->reconnect = 0;
465464
mysqli_globals->report_mode = MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT;;
466465
mysqli_globals->allow_local_infile = 0;
467466
mysqli_globals->local_infile_directory = NULL;

ext/mysqli/mysqli.stub.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ final class mysqli_driver
1313
/** @readonly */
1414
public int $driver_version;
1515

16-
public bool $reconnect = false;
17-
1816
public int $report_mode = 0;
1917
}
2018

ext/mysqli/mysqli_arginfo.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: c6cbd75fdef85706a369d1f06b814c73436f8ae6 */
2+
* Stub hash: 3678d3f6a5bd74a521eadae8db1b9835ef83c423 */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_mysqli_affected_rows, 0, 1, MAY_BE_LONG|MAY_BE_STRING)
55
ZEND_ARG_OBJ_INFO(0, mysql, mysqli, 0)
@@ -1051,12 +1051,6 @@ static zend_class_entry *register_class_mysqli_driver(void)
10511051
zend_declare_typed_property(class_entry, property_driver_version_name, &property_driver_version_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_LONG));
10521052
zend_string_release(property_driver_version_name);
10531053

1054-
zval property_reconnect_default_value;
1055-
ZVAL_BOOL(&property_reconnect_default_value, 0);
1056-
zend_string *property_reconnect_name = zend_string_init("reconnect", sizeof("reconnect") - 1, 1);
1057-
zend_declare_typed_property(class_entry, property_reconnect_name, &property_reconnect_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_BOOL));
1058-
zend_string_release(property_reconnect_name);
1059-
10601054
zval property_report_mode_default_value;
10611055
ZVAL_LONG(&property_report_mode_default_value, 0);
10621056
zend_string *property_report_mode_name = zend_string_init("report_mode", sizeof("report_mode") - 1, 1);

ext/mysqli/mysqli_driver.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,6 @@
2727
#include "zend_exceptions.h"
2828

2929

30-
/* {{{ property driver_reconnect_read */
31-
static int driver_reconnect_read(mysqli_object *obj, zval *retval, bool quiet)
32-
{
33-
ZVAL_BOOL(retval, MyG(reconnect));
34-
return SUCCESS;
35-
}
36-
/* }}} */
37-
38-
/* {{{ property driver_reconnect_write */
39-
static int driver_reconnect_write(mysqli_object *obj, zval *value)
40-
{
41-
ZEND_ASSERT(Z_TYPE_P(value) == IS_TRUE || Z_TYPE_P(value) == IS_FALSE);
42-
MyG(reconnect) = Z_TYPE_P(value) == IS_TRUE;
43-
return SUCCESS;
44-
}
45-
/* }}} */
46-
4730
/* {{{ property driver_report_read */
4831
static int driver_report_read(mysqli_object *obj, zval *retval, bool quiet)
4932
{
@@ -93,7 +76,6 @@ const mysqli_property_entry mysqli_driver_property_entries[] = {
9376
{"client_info", sizeof("client_info") - 1, driver_client_info_read, NULL},
9477
{"client_version", sizeof("client_version") - 1, driver_client_version_read, NULL},
9578
{"driver_version", sizeof("driver_version") - 1, driver_driver_version_read, NULL},
96-
{"reconnect", sizeof("reconnect") - 1, driver_reconnect_read, driver_reconnect_write},
9779
{"report_mode", sizeof("report_mode") - 1, driver_report_read, driver_report_write},
9880
{NULL, 0, NULL, NULL}
9981
};

ext/mysqli/php_mysqli_structs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
248248
char *default_user;
249249
char *default_pw;
250250
char *default_socket;
251-
zend_long reconnect;
252251
zend_long allow_local_infile;
253252
char *local_infile_directory;
254253
zend_long error_no;

0 commit comments

Comments
 (0)