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/mysqlnd/mysqlnd.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/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 88c59a9a56..8bd3561062 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -2717,12 +2717,9 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con v == ' ' || v == '=') { - *p_copy = v; - } else { - *p_copy = '?'; + *p_copy++ = v; } ++p_orig; - ++p_copy; } *p_copy++ = '*'; *p_copy++ = '/'; |