Skip to content

Commit ad5f471

Browse files
committed
(mysqlnd_conn_data, restart_psession) never fails
1 parent 6be1790 commit ad5f471

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ext/mysqlnd/mysqlnd_connection.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,14 +361,14 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_server_option)(MYSQLND_CONN_DATA * const c
361361

362362

363363
/* {{{ mysqlnd_conn_data::restart_psession */
364-
static enum_func_status
364+
static void
365365
MYSQLND_METHOD(mysqlnd_conn_data, restart_psession)(MYSQLND_CONN_DATA * conn)
366366
{
367367
DBG_ENTER("mysqlnd_conn_data::restart_psession");
368368
MYSQLND_INC_CONN_STATISTIC(conn->stats, STAT_CONNECT_REUSED);
369369
conn->current_result = NULL;
370370
conn->last_message.s = NULL;
371-
DBG_RETURN(PASS);
371+
DBG_VOID_RETURN;
372372
}
373373
/* }}} */
374374

ext/mysqlnd/mysqlnd_structs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ typedef enum_func_status (*func_mysqlnd_conn_data__free_reference)(MYSQLND_CONN_
486486
typedef enum_func_status (*func_mysqlnd_conn_data__send_command_do_request)(MYSQLND_CONN_DATA * const conn, const enum php_mysqlnd_server_command command, const zend_uchar * const arg, const size_t arg_len, const bool silent, const bool ignore_upsert_status);
487487
typedef enum_func_status (*func_mysqlnd_conn_data__send_command_handle_response)(MYSQLND_CONN_DATA * const conn, const enum mysqlnd_packet_type ok_packet, const bool silent, const enum php_mysqlnd_server_command command, const bool ignore_upsert_status);
488488

489-
typedef enum_func_status (*func_mysqlnd_conn_data__restart_psession)(MYSQLND_CONN_DATA * conn);
489+
typedef void (*func_mysqlnd_conn_data__restart_psession)(MYSQLND_CONN_DATA * conn);
490490
typedef void (*func_mysqlnd_conn_data__end_psession)(MYSQLND_CONN_DATA * conn);
491491
typedef enum_func_status (*func_mysqlnd_conn_data__send_close)(MYSQLND_CONN_DATA * conn);
492492

0 commit comments

Comments
 (0)