diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_commands.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_commands.c | 711 |
1 files changed, 316 insertions, 395 deletions
diff --git a/ext/mysqlnd/mysqlnd_commands.c b/ext/mysqlnd/mysqlnd_commands.c index 4a43888c82..21b95a8f57 100644 --- a/ext/mysqlnd/mysqlnd_commands.c +++ b/ext/mysqlnd/mysqlnd_commands.c @@ -29,28 +29,16 @@ struct st_mysqlnd_protocol_no_params_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_protocol_no_params_command_context { MYSQLND_CONN_DATA * conn; } context; }; -/* {{{ mysqlnd_com_no_params_free_command */ -static void -mysqlnd_com_no_params_free_command(void * command) -{ - DBG_ENTER("mysqlnd_com_no_params_free_command"); - mnd_efree(command); - DBG_VOID_RETURN; -} -/* }}} */ - /************************** COM_SET_OPTION ******************************************/ struct st_mysqlnd_protocol_com_set_option_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_set_option_context { MYSQLND_CONN_DATA * conn; @@ -60,7 +48,7 @@ struct st_mysqlnd_protocol_com_set_option_command /* {{{ mysqlnd_com_set_option_run */ -enum_func_status +static enum_func_status mysqlnd_com_set_option_run(void *cmd) { struct st_mysqlnd_protocol_com_set_option_command * command = (struct st_mysqlnd_protocol_com_set_option_command *) cmd; @@ -83,29 +71,27 @@ mysqlnd_com_set_option_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_EOF_PACKET, FALSE, COM_SET_OPTION, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } DBG_RETURN(ret); } /* }}} */ -/* {{{ mysqlnd_com_set_option_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_set_option_create_command(va_list args) +/* {{{ mysqlnd_com_set_option_run_command */ +static enum_func_status +mysqlnd_com_set_option_run_command(va_list args) { - struct st_mysqlnd_protocol_com_set_option_command * command; - DBG_ENTER("mysqlnd_com_set_option_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_set_option_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.option = va_arg(args, enum_mysqlnd_server_option); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_set_option_run; - } + struct st_mysqlnd_protocol_com_set_option_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_set_option_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.option = va_arg(args, enum_mysqlnd_server_option); + + ret = mysqlnd_com_set_option_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -132,7 +118,7 @@ mysqlnd_com_debug_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_EOF_PACKET, FALSE, COM_DEBUG, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } DBG_RETURN(ret); @@ -140,21 +126,19 @@ mysqlnd_com_debug_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_debug_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_debug_create_command(va_list args) +/* {{{ mysqlnd_com_debug_run_command */ +static enum_func_status +mysqlnd_com_debug_run_command(va_list args) { - struct st_mysqlnd_protocol_no_params_command * command; - DBG_ENTER("mysqlnd_com_debug_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_no_params_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->parent.free_command = mysqlnd_com_no_params_free_command; - - command->parent.run = mysqlnd_com_debug_run; - } + struct st_mysqlnd_protocol_no_params_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_debug_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + + ret = mysqlnd_com_debug_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -162,7 +146,6 @@ mysqlnd_com_debug_create_command(va_list args) /************************** COM_INIT_DB ******************************************/ struct st_mysqlnd_protocol_com_init_db_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_init_db_context { MYSQLND_CONN_DATA * conn; @@ -193,7 +176,7 @@ mysqlnd_com_init_db_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_OK_PACKET, FALSE, COM_INIT_DB, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } /* @@ -219,22 +202,20 @@ mysqlnd_com_init_db_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_init_db_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_init_db_create_command(va_list args) +/* {{{ mysqlnd_com_init_db_run_command */ +static enum_func_status +mysqlnd_com_init_db_run_command(va_list args) { - struct st_mysqlnd_protocol_com_init_db_command * command; - DBG_ENTER("mysqlnd_com_init_db_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_init_db_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.db = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_init_db_run; - } + struct st_mysqlnd_protocol_com_init_db_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_init_db_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.db = va_arg(args, MYSQLND_CSTRING); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_init_db_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -261,7 +242,7 @@ mysqlnd_com_ping_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_OK_PACKET, TRUE, COM_PING, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } /* The server sends 0 but libmysql doesn't read it and has established @@ -274,21 +255,19 @@ mysqlnd_com_ping_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_ping_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_ping_create_command(va_list args) +/* {{{ mysqlnd_com_ping_run_command */ +static enum_func_status +mysqlnd_com_ping_run_command(va_list args) { - struct st_mysqlnd_protocol_no_params_command * command; - DBG_ENTER("mysqlnd_com_ping_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_no_params_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->parent.free_command = mysqlnd_com_no_params_free_command; - - command->parent.run = mysqlnd_com_ping_run; - } + struct st_mysqlnd_protocol_no_params_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_ping_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_ping_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -296,7 +275,6 @@ mysqlnd_com_ping_create_command(va_list args) /************************** COM_STATISTICS ******************************************/ struct st_mysqlnd_protocol_com_statistics_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_statistics_context { MYSQLND_CONN_DATA * conn; @@ -326,17 +304,15 @@ mysqlnd_com_statistics_run(void *cmd) conn); if (PASS == ret) { - MYSQLND_PACKET_STATS * stats_header = conn->payload_decoder_factory->m.get_stats_packet(conn->payload_decoder_factory, FALSE); - if (!stats_header) { - SET_OOM_ERROR(conn->error_info); - } else { - if (PASS == (ret = PACKET_READ(stats_header))) { - /* will be freed by Zend, thus don't use the mnd_ allocator */ - *message = zend_string_init(stats_header->message.s, stats_header->message.l, 0); - DBG_INF(ZSTR_VAL(*message)); - } - PACKET_FREE(stats_header); + MYSQLND_PACKET_STATS stats_header; + + conn->payload_decoder_factory->m.init_stats_packet(&stats_header); + if (PASS == (ret = PACKET_READ(conn, &stats_header))) { + /* will be freed by Zend, thus don't use the mnd_ allocator */ + *message = zend_string_init(stats_header.message.s, stats_header.message.l, 0); + DBG_INF(ZSTR_VAL(*message)); } + PACKET_FREE(&stats_header); } DBG_RETURN(ret); @@ -344,29 +320,26 @@ mysqlnd_com_statistics_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_statistics_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_statistics_create_command(va_list args) +/* {{{ mysqlnd_com_statistics_run_command */ +static enum_func_status +mysqlnd_com_statistics_run_command(va_list args) { - struct st_mysqlnd_protocol_com_statistics_command * command; - DBG_ENTER("mysqlnd_com_statistics_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_statistics_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.message = va_arg(args, zend_string **); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_statistics_run; - } + struct st_mysqlnd_protocol_com_statistics_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_statistics_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.message = va_arg(args, zend_string **); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_statistics_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_PROCESS_KILL ******************************************/ struct st_mysqlnd_protocol_com_process_kill_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_process_kill_context { MYSQLND_CONN_DATA * conn; @@ -400,7 +373,7 @@ mysqlnd_com_process_kill_run(void *cmd) conn); if (PASS == ret && read_response) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_OK_PACKET, FALSE, COM_PROCESS_KILL, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } if (read_response) { @@ -419,30 +392,27 @@ mysqlnd_com_process_kill_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_process_kill_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_process_kill_create_command(va_list args) +/* {{{ mysqlnd_com_process_kill_run_command */ +static enum_func_status +mysqlnd_com_process_kill_run_command(va_list args) { - struct st_mysqlnd_protocol_com_process_kill_command * command; - DBG_ENTER("mysqlnd_com_process_kill_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_process_kill_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.process_id = va_arg(args, unsigned int); - command->context.read_response = va_arg(args, unsigned int)? TRUE:FALSE; - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_process_kill_run; - } + struct st_mysqlnd_protocol_com_process_kill_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_process_kill_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.process_id = va_arg(args, unsigned int); + command.context.read_response = va_arg(args, unsigned int)? TRUE:FALSE; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_process_kill_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_REFRESH ******************************************/ struct st_mysqlnd_protocol_com_refresh_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_refresh_context { MYSQLND_CONN_DATA * conn; @@ -474,7 +444,7 @@ mysqlnd_com_refresh_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_OK_PACKET, FALSE, COM_REFRESH, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } DBG_RETURN(ret); @@ -482,22 +452,20 @@ mysqlnd_com_refresh_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_refresh_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_refresh_create_command(va_list args) +/* {{{ mysqlnd_com_refresh_run_command */ +static enum_func_status +mysqlnd_com_refresh_run_command(va_list args) { - struct st_mysqlnd_protocol_com_refresh_command * command; - DBG_ENTER("mysqlnd_com_refresh_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_refresh_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.options = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_refresh_run; - } + struct st_mysqlnd_protocol_com_refresh_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_refresh_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.options = va_arg(args, unsigned int); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_refresh_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -505,7 +473,6 @@ mysqlnd_com_refresh_create_command(va_list args) /************************** COM_SHUTDOWN ******************************************/ struct st_mysqlnd_protocol_com_shutdown_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_shutdown_context { MYSQLND_CONN_DATA * conn; @@ -537,7 +504,7 @@ mysqlnd_com_shutdown_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_OK_PACKET, FALSE, COM_SHUTDOWN, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } DBG_RETURN(ret); @@ -545,22 +512,20 @@ mysqlnd_com_shutdown_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_shutdown_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_shutdown_create_command(va_list args) +/* {{{ mysqlnd_com_shutdown_run_command */ +static enum_func_status +mysqlnd_com_shutdown_run_command(va_list args) { - struct st_mysqlnd_protocol_com_shutdown_command * command; - DBG_ENTER("mysqlnd_com_shutdown_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_shutdown_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.level = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_shutdown_run; - } + struct st_mysqlnd_protocol_com_shutdown_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_shutdown_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.level = va_arg(args, unsigned int); + + ret = mysqlnd_com_shutdown_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -568,7 +533,6 @@ mysqlnd_com_shutdown_create_command(va_list args) /************************** COM_QUIT ******************************************/ struct st_mysqlnd_protocol_com_quit_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_quit_context { MYSQLND_CONN_DATA * conn; @@ -600,28 +564,25 @@ mysqlnd_com_quit_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_quit_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_quit_create_command(va_list args) +/* {{{ mysqlnd_com_quit_run_command */ +static enum_func_status +mysqlnd_com_quit_run_command(va_list args) { - struct st_mysqlnd_protocol_com_quit_command * command; - DBG_ENTER("mysqlnd_com_quit_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_quit_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_quit_run; - } + struct st_mysqlnd_protocol_com_quit_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_quit_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + + ret = mysqlnd_com_quit_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ /************************** COM_QUERY ******************************************/ struct st_mysqlnd_protocol_com_query_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_query_context { MYSQLND_CONN_DATA * conn; @@ -658,29 +619,26 @@ mysqlnd_com_query_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_query_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_query_create_command(va_list args) +/* {{{ mysqlnd_com_query_run_command */ +static enum_func_status +mysqlnd_com_query_run_command(va_list args) { - struct st_mysqlnd_protocol_com_query_command * command; - DBG_ENTER("mysqlnd_com_query_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_query_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.query = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_query_run; - } + struct st_mysqlnd_protocol_com_query_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_query_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.query = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_query_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_CHANGE_USER ******************************************/ struct st_mysqlnd_protocol_com_change_user_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_change_user_context { MYSQLND_CONN_DATA * conn; @@ -714,23 +672,21 @@ mysqlnd_com_change_user_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_change_user_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_change_user_create_command(va_list args) +/* {{{ mysqlnd_com_change_user_run_command */ +static enum_func_status +mysqlnd_com_change_user_run_command(va_list args) { - struct st_mysqlnd_protocol_com_change_user_command * command; - DBG_ENTER("mysqlnd_com_change_user_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_change_user_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - command->context.silent = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_change_user_run; - } + struct st_mysqlnd_protocol_com_change_user_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_change_user_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); + command.context.silent = va_arg(args, unsigned int); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_change_user_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -738,7 +694,6 @@ mysqlnd_com_change_user_create_command(va_list args) /************************** COM_REAP_RESULT ******************************************/ struct st_mysqlnd_protocol_com_reap_result_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_reap_result_context { MYSQLND_CONN_DATA * conn; @@ -768,21 +723,19 @@ mysqlnd_com_reap_result_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_reap_result_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_reap_result_create_command(va_list args) +/* {{{ mysqlnd_com_reap_result_run_command */ +static enum_func_status +mysqlnd_com_reap_result_run_command(va_list args) { - struct st_mysqlnd_protocol_com_reap_result_command * command; - DBG_ENTER("mysqlnd_com_reap_result_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_reap_result_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_reap_result_run; - } + struct st_mysqlnd_protocol_com_reap_result_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_reap_result_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + + ret = mysqlnd_com_reap_result_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -790,7 +743,6 @@ mysqlnd_com_reap_result_create_command(va_list args) /************************** COM_STMT_PREPARE ******************************************/ struct st_mysqlnd_protocol_com_stmt_prepare_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_prepare_context { MYSQLND_CONN_DATA * conn; @@ -823,22 +775,20 @@ mysqlnd_com_stmt_prepare_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_prepare_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_prepare_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_prepare_run_command */ +static enum_func_status +mysqlnd_com_stmt_prepare_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_prepare_command * command; - DBG_ENTER("mysqlnd_com_stmt_prepare_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_prepare_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.query = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_prepare_run; - } + struct st_mysqlnd_protocol_com_stmt_prepare_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_stmt_prepare_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.query = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_stmt_prepare_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -846,7 +796,6 @@ mysqlnd_com_stmt_prepare_create_command(va_list args) /************************** COM_STMT_EXECUTE ******************************************/ struct st_mysqlnd_protocol_com_stmt_execute_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_execute_context { MYSQLND_CONN_DATA * conn; @@ -879,22 +828,20 @@ mysqlnd_com_stmt_execute_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_execute_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_execute_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_execute_run_command */ +static enum_func_status +mysqlnd_com_stmt_execute_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_execute_command * command; - DBG_ENTER("mysqlnd_com_stmt_execute_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_execute_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_execute_run; - } + struct st_mysqlnd_protocol_com_stmt_execute_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_execute_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_stmt_execute_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -902,7 +849,6 @@ mysqlnd_com_stmt_execute_create_command(va_list args) /************************** COM_STMT_FETCH ******************************************/ struct st_mysqlnd_protocol_com_stmt_fetch_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_fetch_context { MYSQLND_CONN_DATA * conn; @@ -935,22 +881,20 @@ mysqlnd_com_stmt_fetch_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_fetch_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_fetch_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_fetch_run_command */ +static enum_func_status +mysqlnd_com_stmt_fetch_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_fetch_command * command; - DBG_ENTER("mysqlnd_com_stmt_fetch_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_fetch_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_fetch_run; - } + struct st_mysqlnd_protocol_com_stmt_fetch_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_fetch_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_stmt_fetch_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -958,7 +902,6 @@ mysqlnd_com_stmt_fetch_create_command(va_list args) /************************** COM_STMT_RESET ******************************************/ struct st_mysqlnd_protocol_com_stmt_reset_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_reset_context { MYSQLND_CONN_DATA * conn; @@ -990,7 +933,7 @@ mysqlnd_com_stmt_reset_run(void *cmd) conn); if (PASS == ret) { ret = send_command_handle_response(conn->payload_decoder_factory, PROT_OK_PACKET, FALSE, COM_STMT_RESET, TRUE, - conn->error_info, conn->upsert_status, &conn->last_message, conn->persistent); + conn->error_info, conn->upsert_status, &conn->last_message); } DBG_RETURN(ret); @@ -998,22 +941,20 @@ mysqlnd_com_stmt_reset_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_reset_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_reset_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_reset_run_command */ +static enum_func_status +mysqlnd_com_stmt_reset_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_reset_command * command; - DBG_ENTER("mysqlnd_com_stmt_reset_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_reset_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.stmt_id = va_arg(args, size_t); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_reset_run; - } + struct st_mysqlnd_protocol_com_stmt_reset_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_reset_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.stmt_id = va_arg(args, size_t); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_stmt_reset_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -1021,7 +962,6 @@ mysqlnd_com_stmt_reset_create_command(va_list args) /************************** COM_STMT_SEND_LONG_DATA ******************************************/ struct st_mysqlnd_protocol_com_stmt_send_long_data_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_send_long_data_context { MYSQLND_CONN_DATA * conn; @@ -1054,22 +994,20 @@ mysqlnd_com_stmt_send_long_data_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_send_long_data_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_send_long_data_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_send_long_data_run_command */ +static enum_func_status +mysqlnd_com_stmt_send_long_data_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_send_long_data_command * command; - DBG_ENTER("mysqlnd_com_stmt_send_long_data_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_send_long_data_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_send_long_data_run; - } + struct st_mysqlnd_protocol_com_stmt_send_long_data_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_send_long_data_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_stmt_send_long_data_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -1077,7 +1015,6 @@ mysqlnd_com_stmt_send_long_data_create_command(va_list args) /************************** COM_STMT_CLOSE ******************************************/ struct st_mysqlnd_protocol_com_stmt_close_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_close_context { MYSQLND_CONN_DATA * conn; @@ -1112,22 +1049,20 @@ mysqlnd_com_stmt_close_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_close_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_close_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_close_run_command */ +static enum_func_status +mysqlnd_com_stmt_close_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_close_command * command; - DBG_ENTER("mysqlnd_com_stmt_close_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_close_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.stmt_id = va_arg(args, size_t); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_close_run; - } + struct st_mysqlnd_protocol_com_stmt_close_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_stmt_close_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.stmt_id = va_arg(args, size_t); + + ret = mysqlnd_com_stmt_close_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -1136,7 +1071,6 @@ mysqlnd_com_stmt_close_create_command(va_list args) /************************** COM_ENABLE_SSL ******************************************/ struct st_mysqlnd_protocol_com_enable_ssl_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_enable_ssl_context { MYSQLND_CONN_DATA * conn; @@ -1154,7 +1088,7 @@ mysqlnd_com_enable_ssl_run(void *cmd) struct st_mysqlnd_protocol_com_enable_ssl_command * command = (struct st_mysqlnd_protocol_com_enable_ssl_command *) cmd; enum_func_status ret = FAIL; MYSQLND_CONN_DATA * conn = command->context.conn; - MYSQLND_PACKET_AUTH * auth_packet; + MYSQLND_PACKET_AUTH auth_packet; size_t client_capabilities = command->context.client_capabilities; size_t server_capabilities = command->context.server_capabilities; @@ -1185,15 +1119,11 @@ mysqlnd_com_enable_ssl_run(void *cmd) DBG_INF_FMT("CLIENT_SSL_VERIFY_SERVER_CERT= %d", client_capabilities & CLIENT_SSL_VERIFY_SERVER_CERT? 1:0); DBG_INF_FMT("CLIENT_REMEMBER_OPTIONS= %d", client_capabilities & CLIENT_REMEMBER_OPTIONS? 1:0); - auth_packet = conn->payload_decoder_factory->m.get_auth_packet(conn->payload_decoder_factory, FALSE); - if (!auth_packet) { - SET_OOM_ERROR(conn->error_info); - goto end; - } - auth_packet->client_flags = client_capabilities; - auth_packet->max_packet_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; + conn->payload_decoder_factory->m.init_auth_packet(&auth_packet); + auth_packet.client_flags = client_capabilities; + auth_packet.max_packet_size = MYSQLND_ASSEMBLED_PACKET_MAX_SIZE; - auth_packet->charset_no = command->context.charset_no; + auth_packet.charset_no = command->context.charset_no; #ifdef MYSQLND_SSL_SUPPORTED if (client_capabilities & CLIENT_SSL) { @@ -1207,7 +1137,7 @@ mysqlnd_com_enable_ssl_run(void *cmd) MYSQLND_SSL_PEER_DONT_VERIFY: MYSQLND_SSL_PEER_DEFAULT); DBG_INF("Switching to SSL"); - if (!PACKET_WRITE(auth_packet)) { + if (!PACKET_WRITE(conn, &auth_packet)) { goto close_conn; } @@ -1219,51 +1149,48 @@ mysqlnd_com_enable_ssl_run(void *cmd) } } #else - auth_packet->client_flags &= ~CLIENT_SSL; - if (!PACKET_WRITE(auth_packet)) { + auth_packet.client_flags &= ~CLIENT_SSL; + if (!PACKET_WRITE(conn, &auth_packet)) { goto close_conn; } #endif ret = PASS; end: - PACKET_FREE(auth_packet); + PACKET_FREE(&auth_packet); DBG_RETURN(ret); close_conn: SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); conn->m->send_close(conn); SET_CLIENT_ERROR(conn->error_info, CR_SERVER_GONE_ERROR, UNKNOWN_SQLSTATE, mysqlnd_server_gone); - PACKET_FREE(auth_packet); + PACKET_FREE(&auth_packet); DBG_RETURN(ret); } /* }}} */ -/* {{{ mysqlnd_com_enable_ssl_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_enable_ssl_create_command(va_list args) +/* {{{ mysqlnd_com_enable_ssl_run_command */ +static enum_func_status +mysqlnd_com_enable_ssl_run_command(va_list args) { - struct st_mysqlnd_protocol_com_enable_ssl_command * command; - DBG_ENTER("mysqlnd_com_enable_ssl_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_enable_ssl_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.client_capabilities = va_arg(args, size_t); - command->context.server_capabilities = va_arg(args, size_t); - command->context.charset_no = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_enable_ssl_run; - } + struct st_mysqlnd_protocol_com_enable_ssl_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_enable_ssl_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.client_capabilities = va_arg(args, size_t); + command.context.server_capabilities = va_arg(args, size_t); + command.context.charset_no = va_arg(args, unsigned int); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_enable_ssl_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_READ_HANDSHAKE ******************************************/ struct st_mysqlnd_protocol_com_handshake_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_handshake_context { MYSQLND_CONN_DATA * conn; @@ -1291,164 +1218,158 @@ mysqlnd_com_handshake_run(void *cmd) size_t mysql_flags = command->context.client_flags; MYSQLND_CONN_DATA * conn = command->context.conn; - MYSQLND_PACKET_GREET * greet_packet; + MYSQLND_PACKET_GREET greet_packet; DBG_ENTER("mysqlnd_conn_data::connect_handshake"); DBG_INF_FMT("stream=%p", conn->vio->data->m.get_stream(conn->vio)); DBG_INF_FMT("[user=%s] [db=%s:%d] [flags=%llu]", user, db, db_len, mysql_flags); - greet_packet = conn->payload_decoder_factory->m.get_greet_packet(conn->payload_decoder_factory, FALSE); - if (!greet_packet) { - SET_OOM_ERROR(conn->error_info); - DBG_RETURN(FAIL); /* OOM */ - } + conn->payload_decoder_factory->m.init_greet_packet(&greet_packet); - if (FAIL == PACKET_READ(greet_packet)) { + if (FAIL == PACKET_READ(conn, &greet_packet)) { DBG_ERR("Error while reading greeting packet"); php_error_docref(NULL, E_WARNING, "Error while reading greeting packet. PID=%d", getpid()); goto err; - } else if (greet_packet->error_no) { - DBG_ERR_FMT("errorno=%u error=%s", greet_packet->error_no, greet_packet->error); - SET_CLIENT_ERROR(conn->error_info, greet_packet->error_no, greet_packet->sqlstate, greet_packet->error); + } else if (greet_packet.error_no) { + DBG_ERR_FMT("errorno=%u error=%s", greet_packet.error_no, greet_packet.error); + SET_CLIENT_ERROR(conn->error_info, greet_packet.error_no, greet_packet.sqlstate, greet_packet.error); goto err; - } else if (greet_packet->pre41) { - DBG_ERR_FMT("Connecting to 3.22, 3.23 & 4.0 is not supported. Server is %-.32s", greet_packet->server_version); + } else if (greet_packet.pre41) { + DBG_ERR_FMT("Connecting to 3.22, 3.23 & 4.0 is not supported. Server is %-.32s", greet_packet.server_version); php_error_docref(NULL, E_WARNING, "Connecting to 3.22, 3.23 & 4.0 " - " is not supported. Server is %-.32s", greet_packet->server_version); + " is not supported. Server is %-.32s", greet_packet.server_version); SET_CLIENT_ERROR(conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Connecting to 3.22, 3.23 & 4.0 servers is not supported"); goto err; } - conn->thread_id = greet_packet->thread_id; - conn->protocol_version = greet_packet->protocol_version; - conn->server_version = mnd_pestrdup(greet_packet->server_version, conn->persistent); + conn->thread_id = greet_packet.thread_id; + conn->protocol_version = greet_packet.protocol_version; + conn->server_version = mnd_pestrdup(greet_packet.server_version, conn->persistent); - conn->greet_charset = mysqlnd_find_charset_nr(greet_packet->charset_no); + conn->greet_charset = mysqlnd_find_charset_nr(greet_packet.charset_no); if (!conn->greet_charset) { php_error_docref(NULL, E_WARNING, - "Server sent charset (%d) unknown to the client. Please, report to the developers", greet_packet->charset_no); + "Server sent charset (%d) unknown to the client. Please, report to the developers", greet_packet.charset_no); SET_CLIENT_ERROR(conn->error_info, CR_NOT_IMPLEMENTED, UNKNOWN_SQLSTATE, "Server sent charset unknown to the client. Please, report to the developers"); goto err; } - conn->server_capabilities = greet_packet->server_capabilities; + conn->server_capabilities = greet_packet.server_capabilities; if (FAIL == mysqlnd_connect_run_authentication(conn, user, passwd, db, db_len, (size_t) passwd_len, - greet_packet->authentication_plugin_data, greet_packet->auth_protocol, - greet_packet->charset_no, greet_packet->server_capabilities, + greet_packet.authentication_plugin_data, greet_packet.auth_protocol, + greet_packet.charset_no, greet_packet.server_capabilities, conn->options, mysql_flags)) { goto err; } UPSERT_STATUS_RESET(conn->upsert_status); - UPSERT_STATUS_SET_SERVER_STATUS(conn->upsert_status, greet_packet->server_status); + UPSERT_STATUS_SET_SERVER_STATUS(conn->upsert_status, greet_packet.server_status); - PACKET_FREE(greet_packet); + PACKET_FREE(&greet_packet); DBG_RETURN(PASS); err: conn->server_capabilities = 0; - PACKET_FREE(greet_packet); + PACKET_FREE(&greet_packet); DBG_RETURN(FAIL); } /* }}} */ -/* {{{ mysqlnd_com_handshake_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_handshake_create_command(va_list args) +/* {{{ mysqlnd_com_handshake_run_command */ +static enum_func_status +mysqlnd_com_handshake_run_command(va_list args) { - struct st_mysqlnd_protocol_com_handshake_command * command; - DBG_ENTER("mysqlnd_com_handshake_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_handshake_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.user = *va_arg(args, const MYSQLND_CSTRING *); - command->context.passwd = *va_arg(args, const MYSQLND_CSTRING *); - command->context.database = *va_arg(args, const MYSQLND_CSTRING *); - command->context.client_flags = va_arg(args, size_t); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_handshake_run; - } + struct st_mysqlnd_protocol_com_handshake_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_handshake_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.user = *va_arg(args, const MYSQLND_CSTRING *); + command.context.passwd = *va_arg(args, const MYSQLND_CSTRING *); + command.context.database = *va_arg(args, const MYSQLND_CSTRING *); + command.context.client_flags = va_arg(args, size_t); + + ret = mysqlnd_com_handshake_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ -/* {{{ mysqlnd_get_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_get_command(enum php_mysqlnd_server_command command, ...) +/* {{{ _mysqlnd_run_command */ +static enum_func_status +_mysqlnd_run_command(enum php_mysqlnd_server_command command, ...) { - struct st_mysqlnd_protocol_command * ret; + enum_func_status ret = FAIL; va_list args; - DBG_ENTER("mysqlnd_get_command"); + DBG_ENTER("_mysqlnd_run_command"); va_start(args, command); switch (command) { case COM_SET_OPTION: - ret = mysqlnd_com_set_option_create_command(args); + ret = mysqlnd_com_set_option_run_command(args); break; case COM_DEBUG: - ret = mysqlnd_com_debug_create_command(args); + ret = mysqlnd_com_debug_run_command(args); break; case COM_INIT_DB: - ret = mysqlnd_com_init_db_create_command(args); + ret = mysqlnd_com_init_db_run_command(args); break; case COM_PING: - ret = mysqlnd_com_ping_create_command(args); + ret = mysqlnd_com_ping_run_command(args); break; case COM_STATISTICS: - ret = mysqlnd_com_statistics_create_command(args); + ret = mysqlnd_com_statistics_run_command(args); break; case COM_PROCESS_KILL: - ret = mysqlnd_com_process_kill_create_command(args); + ret = mysqlnd_com_process_kill_run_command(args); break; case COM_REFRESH: - ret = mysqlnd_com_refresh_create_command(args); + ret = mysqlnd_com_refresh_run_command(args); break; case COM_SHUTDOWN: - ret = mysqlnd_com_shutdown_create_command(args); + ret = mysqlnd_com_shutdown_run_command(args); break; case COM_QUIT: - ret = mysqlnd_com_quit_create_command(args); + ret = mysqlnd_com_quit_run_command(args); break; case COM_QUERY: - ret = mysqlnd_com_query_create_command(args); + ret = mysqlnd_com_query_run_command(args); break; case COM_REAP_RESULT: - ret = mysqlnd_com_reap_result_create_command(args); + ret = mysqlnd_com_reap_result_run_command(args); break; case COM_CHANGE_USER: - ret = mysqlnd_com_change_user_create_command(args); + ret = mysqlnd_com_change_user_run_command(args); break; case COM_STMT_PREPARE: - ret = mysqlnd_com_stmt_prepare_create_command(args); + ret = mysqlnd_com_stmt_prepare_run_command(args); break; case COM_STMT_EXECUTE: - ret = mysqlnd_com_stmt_execute_create_command(args); + ret = mysqlnd_com_stmt_execute_run_command(args); break; case COM_STMT_FETCH: - ret = mysqlnd_com_stmt_fetch_create_command(args); + ret = mysqlnd_com_stmt_fetch_run_command(args); break; case COM_STMT_RESET: - ret = mysqlnd_com_stmt_reset_create_command(args); + ret = mysqlnd_com_stmt_reset_run_command(args); break; case COM_STMT_SEND_LONG_DATA: - ret = mysqlnd_com_stmt_send_long_data_create_command(args); + ret = mysqlnd_com_stmt_send_long_data_run_command(args); break; case COM_STMT_CLOSE: - ret = mysqlnd_com_stmt_close_create_command(args); + ret = mysqlnd_com_stmt_close_run_command(args); break; case COM_ENABLE_SSL: - ret = mysqlnd_com_enable_ssl_create_command(args); + ret = mysqlnd_com_enable_ssl_run_command(args); break; case COM_HANDSHAKE: - ret = mysqlnd_com_handshake_create_command(args); + ret = mysqlnd_com_handshake_run_command(args); break; default: break; @@ -1458,7 +1379,7 @@ mysqlnd_get_command(enum php_mysqlnd_server_command command, ...) } /* }}} */ -func_mysqlnd__command_factory mysqlnd_command_factory = mysqlnd_get_command; +func_mysqlnd__run_command mysqlnd_run_command = _mysqlnd_run_command; /* * Local variables: |