10 commits

Author	SHA1	Message	Date
Xinchen Hui	47c9027772	Bump year	2014-01-03 11:06:16 +08:00
Johannes Schlüter	b479c2bffb	Merge branch 'PHP-5.4' into PHP-5.5	2013-02-21 16:50:59 +01:00
Johannes Schlüter	064c62e4cf	Fix #60840 (undefined symbol: mysqlnd_debug_std_no_trace_funcs)	2013-02-21 16:49:28 +01:00
Xinchen Hui	cbb5d42b9b	Merge branch 'PHP-5.4' into PHP-5.5	2013-01-06 10:23:21 +08:00
Xinchen Hui	a426e0b050	bump year	2013-01-06 10:22:15 +08:00
Johannes Schlüter	d6e421f6a6	Pass orig filename and line through to emalloc and friends	2012-06-26 12:33:36 +02:00
Felipe Pena	8775a37559	- Year++	2012-01-01 13:15:04 +00:00
Felipe Pena	4e19825281	- Year++	2012-01-01 13:15:04 +00:00
Andrey Hristov	f06443593e	add a proxy for sppintf and vspprintf	2011-03-18 14:56:20 +00:00
Andrey Hristov	8c14436f73	split mysqlnd_debug.c in 3 files	2011-03-18 11:58:46 +00:00