Skip to content

Commit 2cc9511

Browse files
faizshukrifaizshukri
committed
Move two functions which are used in the extension as methods of
the connection. Two functions less in the global namespace.
1 parent fc622ca commit 2cc9511

File tree

6 files changed

+100
-111
lines changed

6 files changed

+100
-111
lines changed

‎ext/mysqlnd/mysqlnd.c

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -242,16 +242,15 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND *conn TSRMLS_DC)
242242
/* }}} */
243243

244244

245-
/* {{{ mysqlnd_simple_command_handle_response */
246-
enum_func_status
247-
mysqlnd_simple_command_handle_response(MYSQLND *conn, enum php_mysql_packet_type ok_packet,
248-
zend_bool silent, enum php_mysqlnd_server_command command,
249-
zend_bool ignore_upsert_status
250-
TSRMLS_DC)
245+
/* {{{ mysqlnd_conn::simple_command_handle_response */
246+
static enum_func_status
247+
MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)(MYSQLND *conn, enum php_mysql_packet_type ok_packet,
248+
zend_bool silent, enum php_mysqlnd_server_command command,
249+
zend_bool ignore_upsert_status TSRMLS_DC)
251250
{
252251
enum_func_status ret;
253252

254-
DBG_ENTER("mysqlnd_simple_command_handle_response");
253+
DBG_ENTER("mysqlnd_conn::simple_command_handle_response");
255254
DBG_INF_FMT("silent=%d packet=%d command=%s", silent, ok_packet, mysqlnd_command_to_text[command]);
256255

257256
switch (ok_packet) {
@@ -343,17 +342,16 @@ mysqlnd_simple_command_handle_response(MYSQLND *conn, enum php_mysql_packet_type
343342
/* }}} */
344343

345344

346-
/* {{{ mysqlnd_simple_command */
347-
enum_func_status
348-
mysqlnd_simple_command(MYSQLND *conn, enum php_mysqlnd_server_command command,
349-
const char * const arg, size_t arg_len,
350-
enum php_mysql_packet_type ok_packet, zend_bool silent,
351-
zend_bool ignore_upsert_status TSRMLS_DC)
345+
/* {{{ mysqlnd_conn::simple_command */
346+
static enum_func_status
347+
MYSQLND_METHOD(mysqlnd_conn, simple_command)(MYSQLND *conn, enum php_mysqlnd_server_command command,
348+
const char * const arg, size_t arg_len, enum php_mysql_packet_type ok_packet, zend_bool silent,
349+
zend_bool ignore_upsert_status TSRMLS_DC)
352350
{
353351
enum_func_status ret = PASS;
354352
php_mysql_packet_command cmd_packet;
355353

356-
DBG_ENTER("mysqlnd_simple_command");
354+
DBG_ENTER("mysqlnd_conn::simple_command");
357355
DBG_INF_FMT("command=%s ok_packet=%d silent=%d", mysqlnd_command_to_text[command], ok_packet, silent);
358356

359357
switch (CONN_GET_STATE(conn)) {
@@ -394,7 +392,7 @@ mysqlnd_simple_command(MYSQLND *conn, enum php_mysqlnd_server_command command,
394392
DBG_ERR("Server is gone");
395393
ret = FAIL;
396394
} else if (ok_packet != PROT_LAST) {
397-
ret = mysqlnd_simple_command_handle_response(conn, ok_packet, silent, command, ignore_upsert_status TSRMLS_CC);
395+
ret = conn->m->simple_command_handle_response(conn, ok_packet, silent, command, ignore_upsert_status TSRMLS_CC);
398396
}
399397

400398
/*
@@ -419,8 +417,7 @@ MYSQLND_METHOD(mysqlnd_conn, set_server_option)(MYSQLND * const conn,
419417
DBG_ENTER("mysqlnd_conn::set_server_option");
420418

421419
int2store(buffer, (unsigned int) option);
422-
ret = mysqlnd_simple_command(conn, COM_SET_OPTION, buffer, sizeof(buffer),
423-
PROT_EOF_PACKET, FALSE, TRUE TSRMLS_CC);
420+
ret = conn->m->simple_command(conn, COM_SET_OPTION, buffer, sizeof(buffer), PROT_EOF_PACKET, FALSE, TRUE TSRMLS_CC);
424421
DBG_RETURN(ret);
425422
}
426423
/* }}} */
@@ -892,7 +889,7 @@ MYSQLND_METHOD(mysqlnd_conn, query)(MYSQLND *conn, const char *query, unsigned i
892889
DBG_ENTER("mysqlnd_conn::query");
893890
DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query);
894891

895-
if (PASS != mysqlnd_simple_command(conn, COM_QUERY, query, query_len,
892+
if (PASS != conn->m->simple_command(conn, COM_QUERY, query, query_len,
896893
PROT_LAST /* we will handle the OK packet*/,
897894
FALSE, FALSE TSRMLS_CC)) {
898895
DBG_RETURN(FAIL);
@@ -920,7 +917,7 @@ MYSQLND_METHOD(mysqlnd_conn, send_query)(MYSQLND *conn, const char *query, unsig
920917
DBG_ENTER("mysqlnd_conn::send_query");
921918
DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query);
922919

923-
ret = mysqlnd_simple_command(conn, COM_QUERY, query, query_len,
920+
ret = conn->m->simple_command(conn, COM_QUERY, query, query_len,
924921
PROT_LAST /* we will handle the OK packet*/,
925922
FALSE, FALSE TSRMLS_CC);
926923
CONN_SET_STATE(conn, CONN_QUERY_SENT);
@@ -1155,7 +1152,7 @@ MYSQLND_METHOD(mysqlnd_conn, list_fields)(MYSQLND *conn, const char *table, cons
11551152
*p++ = '\0';
11561153
}
11571154

1158-
if (PASS != mysqlnd_simple_command(conn, COM_FIELD_LIST, buff, p - buff,
1155+
if (PASS != conn->m->simple_command(conn, COM_FIELD_LIST, buff, p - buff,
11591156
PROT_LAST /* we will handle the OK packet*/,
11601157
FALSE, TRUE TSRMLS_CC)) {
11611158
DBG_RETURN(NULL);
@@ -1278,7 +1275,7 @@ MYSQLND_METHOD(mysqlnd_conn, dump_debug_info)(MYSQLND * const conn TSRMLS_DC)
12781275
{
12791276
DBG_ENTER("mysqlnd_conn::dump_debug_info");
12801277
DBG_INF_FMT("conn=%llu", conn->thread_id);
1281-
DBG_RETURN(mysqlnd_simple_command(conn, COM_DEBUG, NULL, 0, PROT_EOF_PACKET, FALSE, TRUE TSRMLS_CC));
1278+
DBG_RETURN(conn->m->simple_command(conn, COM_DEBUG, NULL, 0, PROT_EOF_PACKET, FALSE, TRUE TSRMLS_CC));
12821279
}
12831280
/* }}} */
12841281

@@ -1294,7 +1291,7 @@ MYSQLND_METHOD(mysqlnd_conn, select_db)(MYSQLND * const conn,
12941291
DBG_ENTER("mysqlnd_conn::select_db");
12951292
DBG_INF_FMT("conn=%llu db=%s", conn->thread_id, db);
12961293

1297-
ret = mysqlnd_simple_command(conn, COM_INIT_DB, db, db_len, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC);
1294+
ret = conn->m->simple_command(conn, COM_INIT_DB, db, db_len, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC);
12981295
/*
12991296
The server sends 0 but libmysql doesn't read it and has established
13001297
a protocol of giving back -1. Thus we have to follow it :(
@@ -1321,7 +1318,7 @@ MYSQLND_METHOD(mysqlnd_conn, ping)(MYSQLND * const conn TSRMLS_DC)
13211318
DBG_ENTER("mysqlnd_conn::ping");
13221319
DBG_INF_FMT("conn=%llu", conn->thread_id);
13231320

1324-
ret = mysqlnd_simple_command(conn, COM_PING, NULL, 0, PROT_OK_PACKET, TRUE, TRUE TSRMLS_CC);
1321+
ret = conn->m->simple_command(conn, COM_PING, NULL, 0, PROT_OK_PACKET, TRUE, TRUE TSRMLS_CC);
13251322
/*
13261323
The server sends 0 but libmysql doesn't read it and has established
13271324
a protocol of giving back -1. Thus we have to follow it :(
@@ -1344,7 +1341,7 @@ MYSQLND_METHOD(mysqlnd_conn, stat)(MYSQLND *conn, char **message, unsigned int *
13441341
DBG_ENTER("mysqlnd_conn::stat");
13451342
DBG_INF_FMT("conn=%llu", conn->thread_id);
13461343

1347-
ret = mysqlnd_simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, FALSE, TRUE TSRMLS_CC);
1344+
ret = conn->m->simple_command(conn, COM_STATISTICS, NULL, 0, PROT_LAST, FALSE, TRUE TSRMLS_CC);
13481345
if (FAIL == ret) {
13491346
DBG_RETURN(FAIL);
13501347
}
@@ -1378,13 +1375,13 @@ MYSQLND_METHOD(mysqlnd_conn, kill)(MYSQLND *conn, unsigned int pid TSRMLS_DC)
13781375

13791376
/* If we kill ourselves don't expect OK packet, PROT_LAST will skip it */
13801377
if (pid != conn->thread_id) {
1381-
ret = mysqlnd_simple_command(conn, COM_PROCESS_KILL, buff, 4, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC);
1378+
ret = conn->m->simple_command(conn, COM_PROCESS_KILL, buff, 4, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC);
13821379
/*
13831380
The server sends 0 but libmysql doesn't read it and has established
13841381
a protocol of giving back -1. Thus we have to follow it :(
13851382
*/
13861383
SET_ERROR_AFF_ROWS(conn);
1387-
} else if (PASS == (ret = mysqlnd_simple_command(conn, COM_PROCESS_KILL, buff,
1384+
} else if (PASS == (ret = conn->m->simple_command(conn, COM_PROCESS_KILL, buff,
13881385
4, PROT_LAST, FALSE, TRUE TSRMLS_CC))) {
13891386
CONN_SET_STATE(conn, CONN_QUIT_SENT);
13901387
}
@@ -1438,7 +1435,7 @@ MYSQLND_METHOD(mysqlnd_conn, refresh)(MYSQLND * const conn, uint8_t options TSRM
14381435

14391436
int1store(bits, options);
14401437

1441-
DBG_RETURN(mysqlnd_simple_command(conn, COM_REFRESH, (char *)bits, 1, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC));
1438+
DBG_RETURN(conn->m->simple_command(conn, COM_REFRESH, (char *)bits, 1, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC));
14421439
}
14431440
/* }}} */
14441441

@@ -1453,7 +1450,7 @@ MYSQLND_METHOD(mysqlnd_conn, shutdown)(MYSQLND * const conn, uint8_t level TSRML
14531450

14541451
int1store(bits, level);
14551452

1456-
DBG_RETURN(mysqlnd_simple_command(conn, COM_SHUTDOWN, (char *)bits, 1, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC));
1453+
DBG_RETURN(conn->m->simple_command(conn, COM_SHUTDOWN, (char *)bits, 1, PROT_OK_PACKET, FALSE, TRUE TSRMLS_CC));
14571454
}
14581455
/* }}} */
14591456

@@ -1472,7 +1469,7 @@ mysqlnd_send_close(MYSQLND * conn TSRMLS_DC)
14721469
case CONN_READY:
14731470
DBG_INF("Connection clean, sending COM_QUIT");
14741471
if (conn->net.stream) {
1475-
ret = mysqlnd_simple_command(conn, COM_QUIT, NULL, 0, PROT_LAST, TRUE, TRUE TSRMLS_CC);
1472+
ret = conn->m->simple_command(conn, COM_QUIT, NULL, 0, PROT_LAST, TRUE, TRUE TSRMLS_CC);
14761473
}
14771474
/* Do nothing */
14781475
break;
@@ -1888,7 +1885,7 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn,
18881885
}
18891886
*p++ = '\0';
18901887

1891-
if (PASS != mysqlnd_simple_command(conn, COM_CHANGE_USER, buffer, p - buffer,
1888+
if (PASS != conn->m->simple_command(conn, COM_CHANGE_USER, buffer, p - buffer,
18921889
PROT_LAST /* we will handle the OK packet*/,
18931890
silent, TRUE TSRMLS_CC)) {
18941891
DBG_RETURN(FAIL);
@@ -2200,6 +2197,9 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_conn)
22002197
MYSQLND_METHOD_PRIVATE(mysqlnd_conn, free_reference),
22012198
MYSQLND_METHOD_PRIVATE(mysqlnd_conn, get_state),
22022199
MYSQLND_METHOD_PRIVATE(mysqlnd_conn, set_state),
2200+
2201+
MYSQLND_METHOD(mysqlnd_conn, simple_command),
2202+
MYSQLND_METHOD(mysqlnd_conn, simple_command_handle_response)
22032203
MYSQLND_CLASS_METHODS_END;
22042204

22052205

‎ext/mysqlnd/mysqlnd_enum_n_def.h

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,60 @@ typedef enum mysqlnd_collected_stats
478478
} enum_mysqlnd_collected_stats;
479479

480480

481+
/* Enums */
482+
enum php_mysql_packet_type
483+
{
484+
PROT_GREET_PACKET= 0,
485+
PROT_AUTH_PACKET,
486+
PROT_OK_PACKET,
487+
PROT_EOF_PACKET,
488+
PROT_CMD_PACKET,
489+
PROT_RSET_HEADER_PACKET,
490+
PROT_RSET_FLD_PACKET,
491+
PROT_ROW_PACKET,
492+
PROT_STATS_PACKET,
493+
PROT_PREPARE_RESP_PACKET,
494+
PROT_CHG_USER_PACKET,
495+
PROT_LAST, /* should always be last */
496+
};
497+
498+
499+
enum php_mysqlnd_server_command
500+
{
501+
COM_SLEEP = 0,
502+
COM_QUIT,
503+
COM_INIT_DB,
504+
COM_QUERY,
505+
COM_FIELD_LIST,
506+
COM_CREATE_DB,
507+
COM_DROP_DB,
508+
COM_REFRESH,
509+
COM_SHUTDOWN,
510+
COM_STATISTICS,
511+
COM_PROCESS_INFO,
512+
COM_CONNECT,
513+
COM_PROCESS_KILL,
514+
COM_DEBUG,
515+
COM_PING,
516+
COM_TIME = 15,
517+
COM_DELAYED_INSERT,
518+
COM_CHANGE_USER,
519+
COM_BINLOG_DUMP,
520+
COM_TABLE_DUMP,
521+
COM_CONNECT_OUT = 20,
522+
COM_REGISTER_SLAVE,
523+
COM_STMT_PREPARE = 22,
524+
COM_STMT_EXECUTE = 23,
525+
COM_STMT_SEND_LONG_DATA = 24,
526+
COM_STMT_CLOSE = 25,
527+
COM_STMT_RESET = 26,
528+
COM_SET_OPTION = 27,
529+
COM_STMT_FETCH = 28,
530+
COM_DAEMON,
531+
COM_END
532+
};
533+
534+
481535
#define MYSQLND_DEFAULT_PREFETCH_ROWS (ulong) 1
482536

483537
#define MYSQLND_REFRESH_GRANT 1 /* Refresh grant tables */

‎ext/mysqlnd/mysqlnd_loaddata.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
#include "mysqlnd_priv.h"
2626
#include "mysqlnd_debug.h"
2727

28-
enum_func_status mysqlnd_simple_command_handle_response(MYSQLND *conn,
29-
enum php_mysql_packet_type ok_packet,
30-
zend_bool silent, enum php_mysqlnd_server_command command,
31-
zend_bool ignore_upsert_status
32-
TSRMLS_DC);
33-
3428

3529
#define ALLOC_CALLBACK_ARGS(a, b, c)\
3630
if (c) {\
@@ -242,7 +236,7 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
242236

243237
infile_error:
244238
/* get response from server and update upsert values */
245-
if (FAIL == mysqlnd_simple_command_handle_response(conn, PROT_OK_PACKET, FALSE, COM_QUERY, FALSE TSRMLS_CC)) {
239+
if (FAIL == conn->m->simple_command_handle_response(conn, PROT_OK_PACKET, FALSE, COM_QUERY, FALSE TSRMLS_CC)) {
246240
result = FAIL;
247241
}
248242

‎ext/mysqlnd/mysqlnd_ps.c

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ const char * const mysqlnd_stmt_not_prepared = "Statement not prepared";
3838

3939
static struct st_mysqlnd_stmt_methods *mysqlnd_stmt_methods;
4040

41-
/* Exported by mysqlnd.c */
42-
enum_func_status mysqlnd_simple_command(MYSQLND *conn, enum php_mysqlnd_server_command command,
43-
const char * const arg, size_t arg_len,
44-
enum php_mysql_packet_type ok_packet,
45-
zend_bool silent, zend_bool ignore_upsert_status
46-
TSRMLS_DC);
47-
4841
/* Exported by mysqlnd_ps_codec.c */
4942
zend_uchar* mysqlnd_stmt_execute_generate_request(MYSQLND_STMT *stmt, size_t *request_len,
5043
zend_bool *free_buffer TSRMLS_DC);
@@ -343,8 +336,8 @@ MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const stmt, const char * co
343336
stmt_to_prepare = mysqlnd_stmt_init(stmt->conn);
344337
}
345338

346-
if (FAIL == mysqlnd_simple_command(stmt_to_prepare->conn, COM_STMT_PREPARE, query,
347-
query_len, PROT_LAST, FALSE, TRUE TSRMLS_CC) ||
339+
if (FAIL == stmt_to_prepare->conn->m->simple_command(stmt_to_prepare->conn, COM_STMT_PREPARE, query,
340+
query_len, PROT_LAST, FALSE, TRUE TSRMLS_CC) ||
348341
FAIL == mysqlnd_stmt_read_prepare_response(stmt_to_prepare TSRMLS_CC)) {
349342
goto fail;
350343
}
@@ -605,9 +598,9 @@ MYSQLND_METHOD(mysqlnd_stmt, execute)(MYSQLND_STMT * const stmt TSRMLS_DC)
605598

606599
/* support for buffer types should be added here ! */
607600

608-
ret = mysqlnd_simple_command(stmt->conn, COM_STMT_EXECUTE, (char *)request, request_len,
609-
PROT_LAST /* we will handle the response packet*/,
610-
FALSE, FALSE TSRMLS_CC);
601+
ret = stmt->conn->m->simple_command(stmt->conn, COM_STMT_EXECUTE, (char *)request, request_len,
602+
PROT_LAST /* we will handle the response packet*/,
603+
FALSE, FALSE TSRMLS_CC);
611604

612605
if (free_request) {
613606
mnd_efree(request);
@@ -923,9 +916,9 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
923916
int4store(buf, stmt->stmt_id);
924917
int4store(buf + STMT_ID_LENGTH, 1); /* for now fetch only one row */
925918

926-
if (FAIL == mysqlnd_simple_command(stmt->conn, COM_STMT_FETCH, (char *)buf, sizeof(buf),
927-
PROT_LAST /* we will handle the response packet*/,
928-
FALSE, TRUE TSRMLS_CC)) {
919+
if (FAIL == stmt->conn->m->simple_command(stmt->conn, COM_STMT_FETCH, (char *)buf, sizeof(buf),
920+
PROT_LAST /* we will handle the response packet*/,
921+
FALSE, TRUE TSRMLS_CC)) {
929922
stmt->error_info = stmt->conn->error_info;
930923
DBG_RETURN(FAIL);
931924
}
@@ -1133,7 +1126,7 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const stmt TSRMLS_DC)
11331126

11341127
int4store(cmd_buf, stmt->stmt_id);
11351128
if (CONN_GET_STATE(conn) == CONN_READY &&
1136-
FAIL == (ret = mysqlnd_simple_command(conn, COM_STMT_RESET, (char *)cmd_buf,
1129+
FAIL == (ret = conn->m->simple_command(conn, COM_STMT_RESET, (char *)cmd_buf,
11371130
sizeof(cmd_buf), PROT_OK_PACKET,
11381131
FALSE, TRUE TSRMLS_CC))) {
11391132
stmt->error_info = conn->error_info;
@@ -1190,7 +1183,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const stmt, unsigned
11901183
XXX: Unfortunately we have to allocate additional buffer to be able the
11911184
additional data, which is like a header inside the payload.
11921185
This should be optimised, but it will be a pervasive change, so
1193-
mysqlnd_simple_command() will accept not a buffer, but actually MYSQLND_STRING*
1186+
conn->m->simple_command() will accept not a buffer, but actually MYSQLND_STRING*
11941187
terminated by NULL, to send. If the strings are not big, we can collapse them
11951188
on the buffer every connection has, but otherwise we will just send them
11961189
one by one to the wire.
@@ -1206,7 +1199,7 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const stmt, unsigned
12061199
memcpy(cmd_buf + STMT_ID_LENGTH + 2, data, length);
12071200

12081201
/* COM_STMT_SEND_LONG_DATA doesn't send an OK packet*/
1209-
ret = mysqlnd_simple_command(conn, cmd, (char *)cmd_buf, packet_len,
1202+
ret = conn->m->simple_command(conn, cmd, (char *)cmd_buf, packet_len,
12101203
PROT_LAST , FALSE, TRUE TSRMLS_CC);
12111204
mnd_efree(cmd_buf);
12121205
if (FAIL == ret) {
@@ -1976,7 +1969,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const stmt, zend_
19761969

19771970
int4store(cmd_buf, stmt->stmt_id);
19781971
if (CONN_GET_STATE(conn) == CONN_READY &&
1979-
FAIL == mysqlnd_simple_command(conn, COM_STMT_CLOSE, (char *)cmd_buf, sizeof(cmd_buf),
1972+
FAIL == conn->m->simple_command(conn, COM_STMT_CLOSE, (char *)cmd_buf, sizeof(cmd_buf),
19801973
PROT_LAST /* COM_STMT_CLOSE doesn't send an OK packet*/,
19811974
FALSE, TRUE TSRMLS_CC)) {
19821975
stmt->error_info = conn->error_info;

‎ext/mysqlnd/mysqlnd_structs.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,9 @@ struct st_mysqlnd_conn_methods
305305
enum_func_status (*free_reference)(MYSQLND * const conn TSRMLS_DC);
306306
enum mysqlnd_connection_state (*get_state)(MYSQLND * const conn TSRMLS_DC);
307307
void (*set_state)(MYSQLND * const conn, enum mysqlnd_connection_state new_state TSRMLS_DC);
308+
309+
enum_func_status (*simple_command)(MYSQLND *conn, enum php_mysqlnd_server_command command, const char * const arg, size_t arg_len, enum php_mysql_packet_type ok_packet, zend_bool silent, zend_bool ignore_upsert_status TSRMLS_DC);
310+
enum_func_status (*simple_command_handle_response)(MYSQLND *conn, enum php_mysql_packet_type ok_packet, zend_bool silent, enum php_mysqlnd_server_command command, zend_bool ignore_upsert_status TSRMLS_DC);
308311
};
309312

310313

@@ -348,8 +351,6 @@ struct st_mysqlnd_res_methods
348351
zend_bool persistent,
349352
zend_bool as_unicode, zend_bool as_int_or_float,
350353
MYSQLND_STATS * stats TSRMLS_DC);
351-
352-
353354
};
354355

355356

0 commit comments

Comments
 (0)