summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.c
Commit message (Collapse)AuthorAgeFilesLines
* Fixed resource destructionDmitry Stogov2014-05-081-3/+1
|
* Make they are in the same style of Z_ISREFXinchen Hui2014-05-031-1/+1
|
* Split IS_BOOL into IS_FALSE and IS_TRUEDmitry Stogov2014-04-301-1/+1
|
* Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-22/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6Andrey Hristov2014-04-101-16/+5
| |\ | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt
| | * Remove some usages of hashtable internalsNikita Popov2014-04-091-16/+5
| | |
| * | New result fetching mode for mysqlnd, which should use less memory butAndrey Hristov2014-04-101-5/+5
| |/ | | | | | | | | | | | | | | 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]
* | Cleanup (2-nd round)Dmitry Stogov2014-04-151-2/+3
| |
* | Cleanup (1-st round)Dmitry Stogov2014-04-151-4/+4
| |
* | Fixed memory leaksDmitry Stogov2014-04-111-9/+9
| |
* | Fixed error reportingDmitry Stogov2014-04-091-1/+1
| |
* | Fixed reference countingDmitry Stogov2014-04-091-0/+1
| |
* | Fixed reference countingDmitry Stogov2014-04-091-0/+2
| |
* | Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), ↵Dmitry Stogov2014-04-031-1/+1
| | | | | | | | candidate for GC, etc)
* | Changed data layout to allow more efficient operationsDmitry Stogov2014-04-021-9/+9
| |
* | Refactored data structures to keep zend_object* instead of a whole zval in ↵Dmitry Stogov2014-03-281-2/+2
| | | | | | | | some places
* | Refactor ext/mysqlXinchen Hui2014-03-231-414/+397
| |
* | Use better data structures (incomplete)Dmitry Stogov2014-02-101-4/+5
|/
* Bump yearXinchen Hui2014-01-031-1/+1
|
* Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-08-041-1/+1
|\ | | | | | | | | | | | | | | * PHP-5.4: non living code related typo fixes Conflicts: Zend/zend_compile.c
| * non living code related typo fixesVeres Lajos2013-08-041-1/+1
| |
| * less serious compatAbility fixesVeres Lajos2013-07-151-1/+1
| |
* | less serious compatAbility fixesVeres Lajos2013-07-151-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-05-151-1/+1
|\ \ | |/ | | | | | | | | * PHP-5.4: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure
| * Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-05-151-1/+1
| |\ | | | | | | | | | | | | | | | * PHP-5.3: Fix unitialized vars when sql.safe_mode=1 more check for php_stream_fopen_tmpfile failure
| | * Fix unitialized vars when sql.safe_mode=1Anatol Belski2013-05-151-1/+1
| | | | | | | | | | | | which can break the subsequent mysqlnd_connect() call
| | * Happy New Year~Xinchen Hui2013-01-011-1/+1
| | |
| | * - Year++Felipe Pena2012-01-011-1/+1
| | |
| | * - Fix Bug #55550 mysql.trace_mode miscounts result sets,Johannes Schlüter2011-08-311-0/+4
| | | | | | | | | | | | | | | fixes ext/mysql/tests/mysql_deprecated_api.phpt
| | * - Added ZEND_MOD_END macro to use in the end of zend_module_dep[]Felipe Pena2011-08-061-1/+1
| | |
| | * completely compile out a currently non-needed functionAndrey Hristov2011-08-021-2/+2
| | |
| | * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| | |
| | * - handle out of memoryJohannes Schlüter2011-05-181-0/+3
| | |
| | * Fixed variable re-declarationsIlia Alshanetsky2011-02-141-7/+7
| | |
| | * fix more parameter stuff, now it is completeAndrey Hristov2011-01-141-2/+3
| | |
| | * pass data which is availableAndrey Hristov2011-01-141-1/+1
| | |
| | * - Year++Felipe Pena2011-01-011-1/+1
| | |
| | * Fix constness warningsKalle Sommer Nielsen2010-10-051-2/+2
| | |
| | * Trying to fix compiler warnings (on Windows).Ulf Wendel2010-10-041-2/+2
| | |
| | * Sorry again, nothing but removal of white space from the end of the lines.Ulf Wendel2010-10-041-75/+75
| | | | | | | | | | | | | | | | | | - fix compile warning "ext/mysql/php_mysql.c:640:11: warning: extra tokens at end of #ifdef directive"
| | * Plug a leak in mysqli when in the same scriptAndrey Hristov2010-09-301-2/+2
| | | | | | | | | | | | | | | | | | | | | a pconn is reused. Call end_psession earlier - so will mysqlnd and the plugins free data earlier.
| | * Fixed bug #52636 (php_mysql_fetch_hash writes long value into int)Kalle Sommer Nielsen2010-08-181-1/+1
| | | | | | | | | | | | # Tested by rein at basefarm dot no
| | * Update with PHP_DEF_FE, also update the testAndrey Hristov2010-08-171-1/+1
| | |
| | * - Fix arginfo nameFelipe Pena2010-06-281-1/+1
| | |
| | * - Fixed bug #52183 (Reflectionfunction reports invalid number of arguments ↵Felipe Pena2010-06-261-19/+19
| | | | | | | | | | | | for function aliases)
| | * Handle the situation when mysql_init()/mysqlnd_init()Andrey Hristov2010-05-251-2/+10
| | | | | | | | | | | | | | | return NULL. It is a rare case of OOM but PHP shouldn't crash, if possible.
| | * - Added arginfoFelipe Pena2010-05-201-47/+148
| | |
| | * Remove duplicated code.Andrey Hristov2010-05-181-43/+1
| | | | | | | | | | | | | | | Use one centralized functions for data extraction.
| | * Merge safe_mode changes into extensions that are in sync in both branchesKalle Sommer Nielsen2010-04-261-0/+4
| | |
| * | Happy New YearXinchen Hui2013-01-011-1/+1
| | |