summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-134-76/+76
|
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-066-6/+369
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (35 commits) Fixed bug #68398 msooxml matches too many archives Fix zpp call in apache_getenv() Drop unnecessary zval containers fixed test C89 compat add include for missing localeconv_r proto updated NEWS Fixed bug #65230 setting locale randomly broken Fix compilation error (ref #68424) Removed useless handlers Move checks for references into slow paths of operator functions. Remove duplicate opcode handlers. Revert unintentional docblock change Restored zip/oci8 PHP 4 code, add PHP 7 checks Note macro removal in UPGRADING.INTERNALS Removed ZEND_ENGINE_2 checks (and ZE1 code, it's been a decade!) Zend Engine 3 Updated NEWS Updated NEWS Updated NEWS Start adding new attribute to control multi statements ...
| * Merge branch 'PHP-5.6'Anatol Belski2014-12-061-4/+5
| |\ | | | | | | | | | | | | | | | * PHP-5.6: C89 compat add include for missing localeconv_r proto
| | * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-12-061-4/+5
| | |\ | | | | | | | | | | | | | | | | | | | | * PHP-5.5: C89 compat add include for missing localeconv_r proto
| | | * C89 compatAnatol Belski2014-12-061-4/+5
| | | |
| | * | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2014-12-061-2/+2
| | |\ \ | | | |/ | | | | | | | | | | | | * PHP-5.5: Fix compilation error (ref #68424)
| | | * Fix compilation error (ref #68424)Matteo Beccati2014-12-061-2/+2
| | | |
| * | | Merge branch 'PHP-5.6'Julien Pauli2014-12-056-4/+366
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS Updated NEWS Start adding new attribute to control multi statements
| | * | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2014-12-056-4/+366
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Start adding new attribute to control multi statements
| | | * Start adding new attribute to control multi statementspwolanin2014-12-056-4/+366
| | | |
| | * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ext/ftp/ftp.h ext/pcre/pcrelib/pcre_printint.c ext/pcre/pcrelib/sljit/sljitLir.c ext/pcre/pcrelib/sljit/sljitLir.h ext/pcre/pcrelib/sljit/sljitNativeARM_32.c ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c ext/pgsql/pgsql.c ext/phar/func_interceptors.c ext/soap/soap.c ext/standard/image.c
* | | | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-11-261-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: (102 commits) fix dir separator in test fix TS build fix TS build Better fix for bug #68446 Revert "Merge remote-tracking branch 'origin/PHP-5.6'" Revert NEWS and set test to XFAIL Revert "Fix bug #68446 (bug with constant defaults and type hints)" Improved zend_hash_clean() and added new optimized zend_symtable_clean() Use inline version of zval_ptr_dtor() Added new optimized zend_array_destroy() function Moved i_zval_ptr_dtor() from zend_execute.h to zend_variables.h fix REGISTER_NS_*_CONSTANT macros Removed useless assert. EG(uninitialized_zval) can't be refcounted. Use specialized destructors when types of zvals are known. move tests into proper place Improved assignment to object property Reuse zend_assign_to_variable() in zend_std_write_property() cleanup comments from svn/cvs era fix dir separator in test fork test for windows ...
| * | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-231-2/+2
| | | |
* | | | converted ext/sqlite and ext/pdo_mysql to use static tsrmls cacheAnatol Belski2014-10-164-3/+12
|/ / /
* | | Merge branch 'master' into catchable-fatals/methods-on-non-objectsTimm Friebe2014-09-256-50/+50
|\ \ \
| * | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-195-5/+5
| | | |
| * | | Revert previous commit by mistakeXinchen Hui2014-09-041-2/+0
| | | |
| * | | Use PHP_GINIT to suppress incompatible pointer typeXinchen Hui2014-09-041-1/+3
| | | |
| * | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-1/+1
| | | |
| * | | master renamings phase 5Anatol Belski2014-08-251-2/+2
| | | |
| * | | master renames phase 1Anatol Belski2014-08-254-64/+64
| | | |
| * | | yet trivial fixes to mysql extsAnatol Belski2014-08-211-1/+1
| | | |
| * | | ported from pdo - pgsql, odbc, mysql, firebirt, dblibAnatol Belski2014-08-194-43/+43
| | | |
| * | | basic macro replacements, all at onceAnatol Belski2014-08-193-41/+41
| | | |
* | | | MFHTimm Friebe2014-08-167-77/+101
|\ \ \ \ | |/ / /
| * | | clean up - avoid reallocXinchen Hui2014-08-131-5/+4
| | | |
| * | | Don't use zend_string for other fields (only name here is enough)Xinchen Hui2014-06-251-20/+2
| | | |
| * | | Use zend_string in mysqlndXinchen Hui2014-06-231-0/+17
| | | |
| * | | Actually, I don't know how it works. (maybe I should re-start again :<)Xinchen Hui2014-06-231-1/+1
| | | |
| * | | Merge branch 'master' into phpngDmitry Stogov2014-06-205-7/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | * master: Fixed MarinaDB support
| * | | Fixed memory leakXinchen Hui2014-06-201-1/+1
| | | |
| * | | Fixed pdo_mysql build with mysqlndXinchen Hui2014-06-193-3/+4
| | | |
| * | | Merge branch 'master' into phpngDmitry Stogov2014-06-124-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c
| * | | | Fixed bug #47407Xinchen Hui2014-05-271-2/+2
| | | | |
| * | | | Fixed test. The warning actually indicate a problem in master that we didn't ↵Dmitry Stogov2014-05-191-2/+1
| | | | | | | | | | | | | | | | | | | | repeat in phpng.
| * | | | Prevent crash in case of SQL errorDmitry Stogov2014-05-191-1/+3
| | | | |
| * | | | Reverted wrong commitDmitry Stogov2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Xinchen, stop commit changed configs :) You may use environment variables to ovverride default settings
| * | | | restore unexpected commitXinchen Hui2014-05-131-1/+1
| | | | |
| * | | | ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well ↵Xinchen Hui2014-05-081-2/+1
| | | | | | | | | | | | | | | | | | | | while building with libmysql
| * | | | Revert "ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk ↵Xinchen Hui2014-05-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as well while building with libmysql" This reverts commit 29b35292923596413a0fbf49890a2cbb16cbf8b4.
| * | | | ext/pdo_mysql/tests/pdo_mysql_attr_oracle_nulls.phpt fails in trunk as well ↵Xinchen Hui2014-05-081-2/+1
| | | | | | | | | | | | | | | | | | | | while building with libmysql
| * | | | Fixed REFERENCE handlingXinchen Hui2014-05-082-3/+3
| | | | |
| * | | | Fixed bugs in pdo_mysqlXinchen Hui2014-05-081-1/+2
| | | | |
| * | | | Revert "Going to refactor mysqlnd"Xinchen Hui2014-05-081-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 37d9f1e6e91856922726fb950bd3f3e88ed68efb.
| * | | | Going to refactor mysqlndXinchen Hui2014-05-071-1/+2
| | | | |
| * | | | Rerevert previous commit to phpt by accidentXinchen Hui2014-05-072-6/+6
| | | | |
| * | | | Refactored filterXinchen Hui2014-05-072-6/+6
| | | | |
| * | | | Fixed reference handling(param->parameter)Xinchen Hui2014-05-071-20/+39
| | | | |
| * | | | Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd)Xinchen Hui2014-05-073-53/+58
| | | | |
| * | | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-262-3/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status