Andrey Hristov 1f7f8429af Merge branch 'PHP-5.4' into PHP-5.5 ...

Conflicts:
	ext/mysqlnd/mysqlnd.c

2013-01-09 18:40:57 +01:00

..

config9.m4

Add SHA256 authentication support - password hashing to mysqlnd

2012-09-25 14:04:36 +02: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

shift code around to two new files - mysqlnd_driver.c

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

mysqlnd_alloc.c

Merge branch 'PHP-5.4' into PHP-5.5

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

mysqlnd_alloc.h

Merge branch 'PHP-5.4' into PHP-5.5

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

mysqlnd_auth.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08: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

Merge branch 'PHP-5.3' into PHP-5.4

2013-01-06 10:20:00 +08: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

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08: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

support for password expiration in mysqlnd, through a flag

2013-01-09 15:33:07 +01: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

bump year

2013-01-06 10:19:09 +08: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-01-06 10:23:21 +08: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-01-06 10:23:21 +08:00

mysqlnd_ps.c

fix different values of mysqli_stmt_affected_rows between libmysql

2013-01-07 16:36:21 +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 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08: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

Merge branch 'PHP-5.4' into PHP-5.5

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

mysqlnd_wireprotocol.c

Merge branch 'PHP-5.4' into PHP-5.5

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

mysqlnd_wireprotocol.h

Merge branch 'PHP-5.4' into PHP-5.5

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

mysqlnd.c

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-09 18:40:57 +01:00

mysqlnd.h

Merge branch 'PHP-5.4' into PHP-5.5

2013-01-06 10:23:21 +08: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