clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
17c68b9fd8
php-src/ext/mysqlnd
History
Dmitry Stogov f9927a6c97 Merge mainstream 'master' branch into refactoring 
During merge I had to revert:
	Nikita's patch for php_splice() (it probably needs to be applyed again)
	Bob Weinand's patches related to constant expression handling (we need to review them carefully)
	I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)

Conflicts:
	Zend/zend.h
	Zend/zend_API.c
	Zend/zend_ast.c
	Zend/zend_compile.c
	Zend/zend_compile.h
	Zend/zend_constants.c
	Zend/zend_exceptions.c
	Zend/zend_execute.c
	Zend/zend_execute.h
	Zend/zend_execute_API.c
	Zend/zend_hash.c
	Zend/zend_highlight.c
	Zend/zend_language_parser.y
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
	Zend/zend_variables.c
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
	ext/date/php_date.c
	ext/dom/documenttype.c
	ext/hash/hash.c
	ext/iconv/iconv.c
	ext/mbstring/tests/zend_multibyte-10.phpt
	ext/mbstring/tests/zend_multibyte-11.phpt
	ext/mbstring/tests/zend_multibyte-12.phpt
	ext/mysql/php_mysql.c
	ext/mysqli/mysqli.c
	ext/mysqlnd/mysqlnd_reverse_api.c
	ext/mysqlnd/php_mysqlnd.c
	ext/opcache/ZendAccelerator.c
	ext/opcache/zend_accelerator_util_funcs.c
	ext/opcache/zend_persist.c
	ext/opcache/zend_persist_calc.c
	ext/pcre/php_pcre.c
	ext/pdo/pdo_dbh.c
	ext/pdo/pdo_stmt.c
	ext/pdo_pgsql/pgsql_driver.c
	ext/pgsql/pgsql.c
	ext/reflection/php_reflection.c
	ext/session/session.c
	ext/spl/spl_array.c
	ext/spl/spl_observer.c
	ext/standard/array.c
	ext/standard/basic_functions.c
	ext/standard/html.c
	ext/standard/mail.c
	ext/standard/php_array.h
	ext/standard/proc_open.c
	ext/standard/streamsfuncs.c
	ext/standard/user_filters.c
	ext/standard/var_unserializer.c
	ext/standard/var_unserializer.re
	main/php_variables.c
	sapi/phpdbg/phpdbg.c
	sapi/phpdbg/phpdbg_bp.c
	sapi/phpdbg/phpdbg_frame.c
	sapi/phpdbg/phpdbg_help.c
	sapi/phpdbg/phpdbg_list.c
	sapi/phpdbg/phpdbg_print.c
	sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
..
config9.m4 Merge branch '2Guploads' 2013-08-09 11:47:25 +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 fix encoding 2014-01-10 15:57:40 +01:00
mysqlnd_alloc.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_alloc.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_auth.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_block_alloc.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_block_alloc.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_bt.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_charset.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_charset.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_debug.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_debug.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_driver.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_enum_n_def.h New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_ext_plugin.c New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_ext_plugin.h New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_libmysql_compat.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_loaddata.c Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_net.c Merge branch 'PHP-5.6' 2014-01-03 11:09:07 +08:00
mysqlnd_net.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_plugin.c Use better data structures (incomplete) 2014-02-10 10:04:30 +04:00
mysqlnd_portability.h unify stdint type usage 2013-08-06 22:49:56 +02:00
mysqlnd_priv.h Refactor the result set data structures. Move more to the buffered and unbuffered 2014-03-05 16:22:23 +02:00
mysqlnd_ps_codec.c WS 2014-01-24 12:31:19 +02:00
mysqlnd_ps.c Merge branch 'PHP-5.6' 2014-04-10 18:22:01 +03:00
mysqlnd_result_meta.c Refactor the result set data structures. Move more to the buffered and unbuffered 2014-03-05 16:22:23 +02:00
mysqlnd_result_meta.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_result.c New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_result.h New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_reverse_api.c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-10 16:49:13 +03:00
mysqlnd_reverse_api.h New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_statistics.c Cleanup (1-st round) 2014-04-15 15:40:40 +04:00
mysqlnd_statistics.h Bump year 2014-01-03 11:08:10 +08:00
mysqlnd_structs.h fix syntax error in vc++ 2014-04-11 13:08:46 +02:00
mysqlnd_wireprotocol.c New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd_wireprotocol.h New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
mysqlnd.c Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6 2014-04-10 16:49:13 +03:00
mysqlnd.h New result fetching mode for mysqlnd, which should use less memory but 2014-04-10 16:44:54 +03:00
php_mysqlnd.c fix crash in MINFO when no mysqlnd plugins are loaded 2014-04-14 17:44:47 +02:00
php_mysqlnd.h Bump year 2014-01-03 11:08:10 +08:00