Xinchen Hui d4f5ca467f Merge branch 'PHP-5.4' into PHP-5.5 ...

Conflicts:
	configure.in
	ext/mysqlnd/mysqlnd.c
	main/php_version.h

2013-11-05 11:08:09 +08:00

..

config9.m4

Fix long-standing visual pain point: the misalignment of './configure help' text.

2013-08-06 11:06:09 -07:00

config-win.h

MFB: More Windows types cleanup

2008-11-06 18:48:55 +00:00

config.w32

shift code around to two new files - mysqlnd_driver.c

2011-10-21 15:28:58 +00:00

CREDITS

updates

2013-05-21 13:27:45 +02:00

mysqlnd_alloc.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-02-21 16:50:59 +01:00

mysqlnd_alloc.h

Merge branch 'PHP-5.4' into PHP-5.5

2013-02-21 16:50:59 +01:00

mysqlnd_auth.c

Add support for connect attributes, as of MySQL 5.6

2013-01-15 10:04:59 +01:00

mysqlnd_block_alloc.c

bump year

2013-01-06 10:19:09 +08:00

mysqlnd_block_alloc.h

bump year

2013-01-06 10:19:09 +08:00

mysqlnd_bt.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_charset.c

Fix some errors in mysqlnd charset list

2013-03-24 16:09:39 +01:00

mysqlnd_charset.h

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00

mysqlnd_debug.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_debug.h

build fixes

2013-02-11 12:07:10 +01:00

mysqlnd_driver.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_enum_n_def.h

Merge branch 'PHP-5.4' into PHP-5.5

2013-04-19 16:29:53 +02:00

mysqlnd_ext_plugin.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_ext_plugin.h

bump year

2013-01-06 10:22:15 +08:00

mysqlnd_libmysql_compat.h

Export new calls

2013-02-07 18:29:19 +01:00

mysqlnd_loaddata.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_net.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-08-04 16:06:24 -07:00

mysqlnd_net.h

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00

mysqlnd_plugin.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_portability.h

Even better patch

2010-10-04 12:59:29 +00:00

mysqlnd_priv.h

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_ps_codec.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-07-08 20:24:58 +02:00

mysqlnd_ps.c

fix the fix

2013-03-13 15:56:44 +01:00

mysqlnd_result_meta.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_result_meta.h

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00

mysqlnd_result.c

Merge branch 'pull-request/341'

2013-06-10 14:30:59 -07:00

mysqlnd_result.h

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00

mysqlnd_reverse_api.c

bump year

2013-01-06 10:22:15 +08:00

mysqlnd_reverse_api.h

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_statistics.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

mysqlnd_statistics.h

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00

mysqlnd_structs.h

don't include smart_str.h in a too global header, fixes #64718

2013-04-30 14:26:55 +02:00

mysqlnd_wireprotocol.c

Add support for connect attributes, as of MySQL 5.6

2013-01-15 10:04:59 +01:00

mysqlnd_wireprotocol.h

Add support for connect attributes, as of MySQL 5.6

2013-01-15 10:04:59 +01:00

mysqlnd.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-11-05 11:08:09 +08:00

mysqlnd.h

Add savepoint and rollback to savepoint support

2013-02-08 16:36:17 +01:00

php_mysqlnd.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08:00

php_mysqlnd.h

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08:00