archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.4' into PHP-5.5

Browse source 
Conflicts:
	NEWS
This commit is contained in:
Andrey Hristov 2013-07-08 20:24:58 +02:00
commit 3dd5f4ae4c
2 changed files with 51 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

50
ext/mysqli/tests/mysqli_stmt_big_prepare.phpt Normal file
View file

File diff suppressed because one or more lines are too long

1
ext/mysqlnd/mysqlnd_ps_codec.c
View file

@ -559,6 +559,7 @@ mysqlnd_stmt_execute_store_params(MYSQLND_STMT * s, zend_uchar **buf, zend_uchar
*p += null_count;
}
left = (*buf_len - (*p - *buf));
/* 1. Store type information */
/*
check if need to send the types even if stmt->send_types_to_server is 0. This is because