Skip to content

Remove unused mysqlnd options #20979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kamil-tekiela wants to merge 5 commits into
base: master
Choose a base branch
from
+4 −32
Open

Remove unused mysqlnd options #20979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c15c5c0
Remove MYSQL_OPT_PROTOCOL and MYSQL_OPT_NAMED_PIPE
kamil-tekiela Jan 19, 2026
6ce6877
Remove MYSQL_OPT_WRITE_TIMEOUT
kamil-tekiela Jan 19, 2026
5ea7180
Drop the now unused enum
kamil-tekiela Jan 20, 2026
c332352
Drop struct field timeout_write
kamil-tekiela Jan 20, 2026
6116737
Add changelog
kamil-tekiela Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UPGRADING.INTERNALS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ PHP 8.6 INTERNALS UPGRADE NOTES
- ext/mysqlnd:
. Dropped session_options parameter from all methods in mysqlnd_auth.
The same information is present in conn->options and should be used instead.
. Dropped unused protocol element from st_mysqlnd_session_options.

- ext/standard:
. _php_error_log() now has a formal return type of zend_result.
Expand Down
3 changes: 0 additions & 3 deletions ext/mysqli/mysqli_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1158,10 +1158,7 @@ static int mysqli_options_get_option_zval_type(int option)
case MYSQLND_OPT_INT_AND_FLOAT_NATIVE:
case MYSQL_OPT_CONNECT_TIMEOUT:
case MYSQL_OPT_LOCAL_INFILE:
case MYSQL_OPT_NAMED_PIPE:
case MYSQL_OPT_PROTOCOL:
case MYSQL_OPT_READ_TIMEOUT:
case MYSQL_OPT_WRITE_TIMEOUT:
case MYSQL_OPT_SSL_VERIFY_SERVER_CERT:
case MYSQL_OPT_COMPRESS:
case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
Expand Down
9 changes: 0 additions & 9 deletions ext/mysqlnd/mysqlnd_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c

switch (option) {
case MYSQL_OPT_READ_TIMEOUT:
case MYSQL_OPT_WRITE_TIMEOUT:
case MYSQLND_OPT_SSL_KEY:
case MYSQLND_OPT_SSL_CERT:
case MYSQLND_OPT_SSL_CA:
Expand Down Expand Up @@ -1484,14 +1483,6 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c
DBG_INF_FMT("charset=%s", conn->options->charset_name);
break;
}
case MYSQL_OPT_NAMED_PIPE:
conn->options->protocol = MYSQL_PROTOCOL_PIPE;
break;
case MYSQL_OPT_PROTOCOL:
if (*(unsigned int*) value < MYSQL_PROTOCOL_LAST) {
conn->options->protocol = *(unsigned int*) value;
}
break;
case MYSQLND_OPT_MAX_ALLOWED_PACKET:
if (*(unsigned int*) value > (1<<16)) {
conn->options->max_allowed_packet = *(unsigned int*) value;
Expand Down
16 changes: 3 additions & 13 deletions ext/mysqlnd/mysqlnd_enum_n_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,17 @@ typedef enum mysqlnd_client_option
{
MYSQL_OPT_CONNECT_TIMEOUT,
MYSQL_OPT_COMPRESS,
MYSQL_OPT_NAMED_PIPE,
MYSQL_OPT_NAMED_PIPE, /* Unsupported by mysqlnd */
MYSQL_INIT_COMMAND,
MYSQL_READ_DEFAULT_FILE,
MYSQL_READ_DEFAULT_GROUP,
MYSQL_SET_CHARSET_DIR, /* Unsupported by mysqlnd */
MYSQL_SET_CHARSET_NAME,
MYSQL_OPT_LOCAL_INFILE,
MYSQL_OPT_PROTOCOL,
MYSQL_OPT_PROTOCOL, /* Unsupported by mysqlnd */
MYSQL_SHARED_MEMORY_BASE_NAME, /* Unsupported by mysqlnd */
MYSQL_OPT_READ_TIMEOUT,
MYSQL_OPT_WRITE_TIMEOUT,
MYSQL_OPT_WRITE_TIMEOUT, /* Unsupported by mysqlnd */
MYSQL_OPT_USE_RESULT, /* Unsupported by mysqlnd */
MYSQL_OPT_USE_REMOTE_CONNECTION, /* Unsupported by mysqlnd; removed in MySQL-8.0 */
MYSQL_OPT_USE_EMBEDDED_CONNECTION, /* Unsupported by mysqlnd; removed in MySQL-8.0 */
Expand Down Expand Up @@ -252,16 +252,6 @@ typedef enum mysqlnd_client_option
MYSQLND_OPT_AUTH_PROTOCOL = 211
} enum_mysqlnd_client_option;

typedef enum mysqlnd_session_protocol_type
{
MYSQL_PROTOCOL_DEFAULT = 0,
MYSQL_PROTOCOL_TCP, /* all, supported */
MYSQL_PROTOCOL_SOCKET, /* unix, supported */
MYSQL_PROTOCOL_PIPE, /* win32, not-supported */
MYSQL_PROTOCOL_MEMORY, /* win32, not-supported */
MYSQL_PROTOCOL_LAST
} enum_mysqlnd_session_protocol_type;

typedef enum mysqlnd_field_types
{
MYSQL_TYPE_DECIMAL = 0,
Expand Down
2 changes: 0 additions & 2 deletions ext/mysqlnd/mysqlnd_structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ typedef struct st_mysqlnd_session_options
char * unused2;
char * unused3;

enum_mysqlnd_session_protocol_type protocol;

char *charset_name;
/* maximum allowed packet size for communication */
Expand All @@ -239,7 +238,6 @@ typedef struct st_mysqlnd_vio_options
/* timeouts */
unsigned int timeout_connect;
unsigned int timeout_read;
unsigned int timeout_write;

size_t net_read_buffer_size;

Expand Down
5 changes: 0 additions & 5 deletions ext/mysqlnd/mysqlnd_vio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,11 +438,6 @@ MYSQLND_METHOD(mysqlnd_vio, set_client_option)(MYSQLND_VIO * const net, enum_mys
case MYSQL_OPT_READ_TIMEOUT:
net->data->options.timeout_read = *(unsigned int*) value;
break;
#ifdef WHEN_SUPPORTED_BY_MYSQLI
case MYSQL_OPT_WRITE_TIMEOUT:
net->data->options.timeout_write = *(unsigned int*) value;
break;
#endif
default:
DBG_RETURN(FAIL);
}
Expand Down
Loading