php-src/ext/mysqli
Dmitry Stogov 7fcd4064c0 Merge branch 'master' into phpng
* master: (41 commits)
  fix test - output can be chunked
  fix test
  fix test
  Fixed test for commit 997be125eb
  Add bug fix to NEWS
  Update UPGRADING according to bug fix
  fix test
  improve CURL tests to allow testing without separate server
  improve CURL tests to allow testing without separate server
  Fixed bug #67199	mb_regex_encoding mishmash
  Fix bug #67248 (imageaffinematrixget missing check of parameters)
  Fix bug #67247	spl_fixedarray_resize integer overflow
  fix news
  add tests stuff to README
  Updated NEWS
  Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) Linux apparently does not like memcpy in overlapping regions...
  - Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
  - Move checking
  - Fixed missing NULL check in SimpleXMLElement::xpath()
  - Fixed missing NULL check
  ...

Conflicts:
	ext/bz2/bz2.c
	ext/gd/gd.c
	ext/mbstring/php_mbregex.c
	ext/session/tests/031.phpt
	ext/simplexml/simplexml.c
	ext/spl/spl_fixedarray.c
2014-05-13 15:24:40 +04:00
..
tests Finish refactoring of MySQLi 2014-05-11 19:37:48 +08:00
config.m4 Fix long-standing visual pain point: the misalignment of './configure help' text. 2013-08-06 11:06:09 -07:00
config.w32 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
CREDITS
mysqli_api.c Finish refactoring of MySQLi 2014-05-11 19:37:48 +08:00
mysqli_driver.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_embedded.c Bump year 2014-01-03 11:08:10 +08:00
mysqli_exception.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_fe.c New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqli_fe.h Add new INI for rollbacking connections put back into the pconn pool 2014-01-29 15:27:43 +02:00
mysqli_libmysql.h Bump year 2014-01-03 11:08:10 +08:00
mysqli_mysqlnd.h Move from directly referencing an aggregated structure to using a 2011-10-25 23:01:49 +00:00
mysqli_nonapi.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_priv.h Merge branch 'master' into phpng 2014-05-13 15:24:40 +04:00
mysqli_prop.c Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
mysqli_report.c Bump year 2014-01-03 11:08:10 +08:00
mysqli_result_iterator.c Refactor MySQLi (incompleted, only compilable now) 2014-05-11 14:53:18 +08:00
mysqli_warning.c Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
mysqli.c Various bug fixes (now 17 tests fails, it is 11 in trunk) 2014-05-11 17:02:08 +08:00
mysqli.dsp revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
package.xml remove dead and unused for more than 8 years code 2012-05-03 12:22:25 +02:00
php_mysqli_structs.h Various bug fixed 2014-05-11 16:05:14 +08:00
php_mysqli.h Bump year 2014-01-03 11:08:10 +08:00
TODO