summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_loaddata.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2015-11-02 14:16:18 +0100
committerAndrey Hristov <andrey@php.net>2015-11-12 16:19:16 +0100
commit7e6f9a84cb8693ec24ec44d902c15d99300d3641 (patch)
tree4a9e401838d2bb5012e01370c7db624bf4c47e9c /ext/mysqlnd/mysqlnd_loaddata.c
parentaa4966d4e37076ed560ba0a10f0758863d8af389 (diff)
downloadphp-git-7e6f9a84cb8693ec24ec44d902c15d99300d3641.tar.gz
MNDR:
- split handle_response() into handle_OK and handle_EOF
Diffstat (limited to 'ext/mysqlnd/mysqlnd_loaddata.c')
-rw-r--r--ext/mysqlnd/mysqlnd_loaddata.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c
index b43607443e..51e887c128 100644
--- a/ext/mysqlnd/mysqlnd_loaddata.c
+++ b/ext/mysqlnd/mysqlnd_loaddata.c
@@ -136,7 +136,7 @@ mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn)
/* }}} */
-static const char *lost_conn = "Lost connection to MySQL server during LOAD DATA of local file";
+static const char *lost_conn = "Lost connection to MySQL server during LOAD DATA of a local file";
/* {{{ mysqlnd_handle_local_infile */
@@ -213,7 +213,11 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * const filenam
infile_error:
/* get response from server and update upsert values */
if (FAIL == send_command_handle_response(PROT_OK_PACKET, FALSE, COM_QUERY, FALSE,
- conn->error_info, conn->upsert_status, conn->payload_decoder_factory, &conn->last_message, conn->persistent)) {
+ conn->error_info,
+ conn->upsert_status,
+ conn->payload_decoder_factory,
+ &conn->last_message,
+ conn->persistent)) {
result = FAIL;
}