summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_loaddata.c
diff options
context:
space:
mode:
authorJohannes Schlüter <johannes@php.net>2008-10-27 17:21:22 +0000
committerJohannes Schlüter <johannes@php.net>2008-10-27 17:21:22 +0000
commit04d9bbe65e9bbf6f76ac1b948e495e2e03b15a5e (patch)
tree9aede3977a86bc2030b82ae23aa0f2d07ae4e0e8 /ext/mysqlnd/mysqlnd_loaddata.c
parent7d4c51c2bd3571feaecb1040bd4b746dcc126a07 (diff)
downloadphp-git-04d9bbe65e9bbf6f76ac1b948e495e2e03b15a5e.tar.gz
MFH: Fix #46285 (lastInsertId() returns "0" when a deferenced PDOStatement is
executed)
Diffstat (limited to 'ext/mysqlnd/mysqlnd_loaddata.c')
-rw-r--r--ext/mysqlnd/mysqlnd_loaddata.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c
index 3298c10380..7f421995ca 100644
--- a/ext/mysqlnd/mysqlnd_loaddata.c
+++ b/ext/mysqlnd/mysqlnd_loaddata.c
@@ -27,7 +27,8 @@
enum_func_status mysqlnd_simple_command_handle_response(MYSQLND *conn,
enum php_mysql_packet_type ok_packet,
- zend_bool silent, enum php_mysqlnd_server_command command
+ zend_bool silent, enum php_mysqlnd_server_command command,
+ zend_bool ignore_upsert_status
TSRMLS_DC);
@@ -241,7 +242,7 @@ mysqlnd_handle_local_infile(MYSQLND *conn, const char *filename, zend_bool *is_w
infile_error:
/* get response from server and update upsert values */
- if (FAIL == mysqlnd_simple_command_handle_response(conn, PROT_OK_PACKET, FALSE, COM_QUERY TSRMLS_CC)) {
+ if (FAIL == mysqlnd_simple_command_handle_response(conn, PROT_OK_PACKET, FALSE, COM_QUERY, FALSE TSRMLS_CC)) {
result = FAIL;
goto infile_error;
}