diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 1b041da5affed..d00c6e337eae4 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -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.
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 1bf74dd77eeab..b792c71907ab3 100644
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -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:
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c
index 4a9732a028956..f50c47158cbd6 100644
--- a/ext/mysqlnd/mysqlnd_connection.c
+++ b/ext/mysqlnd/mysqlnd_connection.c
@@ -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:
@@ -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;
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 851174032c404..a64ce1f4212f0 100644
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -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 */
@@ -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,
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index ce102650b03c9..2c1f3b8d1fc0e 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -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 */
@@ -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;
 
diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c
index 3a3f7b207214a..fc54f292a3ceb 100644
--- a/ext/mysqlnd/mysqlnd_vio.c
+++ b/ext/mysqlnd/mysqlnd_vio.c
@@ -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);
 	}