diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
| commit | a3322f8927618a8cadbef4ae2121084b44a564d3 (patch) | |
| tree | 939a94efa58136e851e478e070daf89edaa18376 /ext/mysqlnd/mysqlnd_loaddata.c | |
| parent | eb012cf88440423ff02c46421f29a1c6e850702c (diff) | |
| parent | 896ac689c91967dec0601fa9fe048c518da52a3c (diff) | |
| download | php-git-a3322f8927618a8cadbef4ae2121084b44a564d3.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
Diffstat (limited to 'ext/mysqlnd/mysqlnd_loaddata.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_loaddata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c index 61cf235988..4655481af9 100644 --- a/ext/mysqlnd/mysqlnd_loaddata.c +++ b/ext/mysqlnd/mysqlnd_loaddata.c @@ -188,7 +188,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen char tmp_buf[sizeof(conn->error_info->error)]; int tmp_error_no; *is_warning = TRUE; - /* error occured */ + /* error occurred */ tmp_error_no = infile.local_infile_error(info, tmp_buf, sizeof(tmp_buf) TSRMLS_CC); SET_CLIENT_ERROR(*conn->error_info, tmp_error_no, UNKNOWN_SQLSTATE, tmp_buf); /* write empty packet to server */ @@ -211,7 +211,7 @@ mysqlnd_handle_local_infile(MYSQLND_CONN_DATA * conn, const char * filename, zen goto infile_error; } - /* error during read occured */ + /* error during read occurred */ if (bufsize < 0) { char tmp_buf[sizeof(conn->error_info->error)]; int tmp_error_no; |