archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
Conflicts:
	ext/mysqli/mysqli_api.c
This commit is contained in:
Andrey Hristov 2014-03-20 16:16:12 +02:00
commit e52334fdbe
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/mysqli/mysqli_api.c
View file

@ -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)
/* {{{ 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++ = '/';

5
ext/mysqlnd/mysqlnd.c
View file

@ -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++ = '/';