summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
| * | | | | Cleanup (1-st round)Dmitry Stogov2014-04-152-9/+9
| | | | | |
| * | | | | Bump yearXinchen Hui2014-01-035-5/+5
| | | | | |
* | | | | | Adjust expected fatal error messageTimm Friebe2014-07-064-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Now also includes "on [TYPE]" after merge from master
* | | | | | Merge in changes from masterTimm Friebe2014-07-065-8/+8
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Now also includes "on [TYPE]" in "Call to a member function" error
| * | | | | Merge branch 'PHP-5.5' into PHP-5.6Dmitry Stogov2014-06-205-7/+7
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | * PHP-5.5: Fixed MarinaDB support
| | * | | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2014-06-205-7/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed MarinaDB support
| | | * | | Fixed MarinaDB supportDmitry Stogov2014-06-205-7/+7
| | | | | |
| * | | | | Bug 64744Boro Sitnikovski2014-06-084-4/+4
| | |_|_|/ | |/| | | | | | | | | | | | | Show the type of the non-object for more descriptive errors
* | | | | Adjust expected outcome (non-Zend tests)Timm Friebe2014-04-194-4/+4
|/ / / /
* | | | New result fetching mode for mysqlnd, which should use less memory butAndrey Hristov2014-04-101-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | implies more memory copy. The old method is still available and can be used. It stays as default. Choosing the method is through a flag to mysqli_query()/mysqli_real_query() New mode can be forced with an INI setting, for all extensions that support this mode (ext/mysql and mysqli, because PDO due to it's architecture can't support it) The setting is mysqlnd.fetch_data_copy=[0|1]
* | | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2014-02-231-1/+6
|\ \ \ | |/ /
| * | We can't dereference dbh if it is NULLJohannes Schlüter2014-02-231-1/+6
| | |
| * | Bump yearXinchen Hui2014-01-035-5/+5
| | |
* | | Bump yearXinchen Hui2014-01-035-5/+5
| |/ |/|
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-11-261-0/+38
|\ \ | |/
| * add testAndrey Hristov2013-11-261-0/+38
| |
* | fix mysql tests & mark nextRowset problematic testsStanislav Malyshev2013-08-246-9/+18
| |
* | Fix long-standing visual pain point: the misalignment of './configure help' ↵Christopher Jones2013-08-061-3/+3
| | | | | | | | | | | | text. Whitespace changes and a couple of grammar fixes.
* | This doesn't fail in 5.5 anymoreRasmus Lerdorf2013-08-031-2/+0
| |
* | Merge commit 'd60e168' into PHP-5.5Rasmus Lerdorf2013-08-021-1/+1
|\ \ | |/ | | | | | | * commit 'd60e168': pcre_quote? No such thing. How did this ever pass?
| * pcre_quote? No such thing. How did this ever pass?Rasmus Lerdorf2013-08-021-1/+1
| |
* | Merge commit 'ea75b1b' into PHP-5.5Rasmus Lerdorf2013-08-021-0/+1
|\ \ | |/ | | | | | | * commit 'ea75b1b': This test needs local infile enabled
| * This test needs local infile enabledRasmus Lerdorf2013-08-021-0/+1
| |
View Lorry Controller Status