diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-07-03 17:10:58 +0200 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-07-03 17:10:58 +0200 |
| commit | 9aa7343ae0828d881e8438a5a9146fd4a95a93d9 (patch) | |
| tree | e29e46161f7df8960646d2db8c59377937f60216 /ext/mysqlnd/mysqlnd.c | |
| parent | 631bb27dcacf625e35f6dacc5e8df0b45624531a (diff) | |
| parent | 5bc7e597d990eb3c38d07c0189d27c246c7b4ae5 (diff) | |
| download | php-git-9aa7343ae0828d881e8438a5a9146fd4a95a93d9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 1d4e387d23..1a898690e3 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1180,7 +1180,7 @@ static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query); - enum_func_status ret; + enum_func_status ret = FAIL; DBG_ENTER("mysqlnd_conn_data::send_query"); DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query); @@ -1587,7 +1587,7 @@ static ulong MYSQLND_METHOD(mysqlnd_conn_data, escape_string)(MYSQLND_CONN_DATA * const conn, char * newstr, const char * escapestr, size_t escapestr_len TSRMLS_DC) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, escape_string); - ulong ret; + ulong ret = FAIL; DBG_ENTER("mysqlnd_conn_data::escape_string"); DBG_INF_FMT("conn=%llu", conn->thread_id); |