diff options
| author | Andrey Hristov <andrey@php.net> | 2013-07-08 20:28:51 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2013-07-08 20:28:51 +0200 |
| commit | 2c3f6dcdb6de8cd43371e91fb470e547aa217327 (patch) | |
| tree | 6a51ff7f6c31d6e99a248eada3e2052d26ebc680 /ext/mysqlnd | |
| parent | 9fc38183b707341b6eddb8c196d0ea2b7c13d6a9 (diff) | |
| parent | e4a28b7b7b972fecd01458364c0663195352891e (diff) | |
| download | php-git-2c3f6dcdb6de8cd43371e91fb470e547aa217327.tar.gz | |
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqlnd')
| -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 d70582b7fb..8ed810d9d6 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1061,7 +1061,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); @@ -1468,7 +1468,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); |