diff options
| author | Andrey Hristov <andrey@php.net> | 2014-03-20 16:16:12 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2014-03-20 16:16:12 +0200 |
| commit | e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1 (patch) | |
| tree | 7175389258e9218582dd5ad4f9494cfd67dbacd6 /ext/mysqli/mysqli_api.c | |
| parent | e1fe76f28ae4d93306c53477968311924f83bb79 (diff) | |
| parent | 059bc99d941a9984c88b80562e39421850fb2690 (diff) | |
| download | php-git-e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Conflicts:
ext/mysqli/mysqli_api.c
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 97f2b766a4..56b9f12bcb 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -33,9 +33,9 @@ #include "ext/standard/php_smart_str.h" #include "php_mysqli_structs.h" #include "mysqli_priv.h" -#if !defined(MYSQLI_USE_MYSQLND) +#if !defined(MYSQLI_USE_MYSQLND) /* {{{ mysqli_tx_cor_options_to_string */ static void mysqli_tx_cor_options_to_string(const MYSQL * const conn, smart_str * str, const unsigned int mode) { @@ -101,12 +101,9 @@ static int mysqli_commit_or_rollback_libmysql(MYSQL * conn, zend_bool commit, co v == ' ' || v == '=') { - *p_copy = v; - } else { - *p_copy = '?'; + *p_copy++ = v; } ++p_orig; - ++p_copy; } *p_copy++ = '*'; *p_copy++ = '/'; |