summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fixed version checkXinchen Hui2014-08-151-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into phpngXinchen Hui2014-07-181-3/+4
|\ \ | |/ | | | | | | | | Conflicts: Zend/zend_compile.h ext/openssl/xp_ssl.c
| * Add some trace info as well as update CLIENT_ flagsAndrey Hristov2014-07-161-3/+4
| |
* | Refactored run_time_cache usage in object handlersDmitry Stogov2014-07-071-3/+3
| |
* | Fixed releasing of hash_keyXinchen Hui2014-06-191-1/+1
| |
* | Fixed MySQLi built with mysqlndXinchen Hui2014-06-191-1/+1
| |
* | Fixed error messagesDmitry Stogov2014-06-121-2/+2
| |
* | Avoid useless mergeDmitry Stogov2014-06-041-2/+8
| |
* | Various bug fixes (now 17 tests fails, it is 11 in trunk)Xinchen Hui2014-05-111-4/+1
| |
* | Various bug fixedXinchen Hui2014-05-111-9/+12
| |
* | Refactor MySQLi (incompleted, only compilable now)Xinchen Hui2014-05-111-192/+190
| |
* | Split IS_BOOL into IS_FALSE and IS_TRUEDmitry Stogov2014-04-301-1/+1
| |
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-18/+16
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0/+1
| |/ | | | | | | | | | | | | | | 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.5' into PHP-5.6Remi Collet2014-02-271-1/+8
| |\ | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS NEWS test for bug #66762 Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
| | * Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-02-271-1/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: NEWS test for bug #66762 Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closed
| | | * Fixed Bug #66762 Segfault in mysqli_stmt::bind_result() when link closedRemi Collet2014-02-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each new mysqli_stmt now increase the refcount of the link object. So the link is really destroy after all statements. Only implemented with libmysqlclient, as mysqlnd already implement this internally. So, libmysqlclient and mysqlnd have the same behavior.
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| | * | Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| * | | Add new INI for rollbacking connections put back into the pconn poolAndrey Hristov2014-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | as well a function get the the statistics in easier way than ob_start() and parsing phpinfo().
* | | | Use better data structures (incomplete)Dmitry Stogov2014-02-101-6/+7
|/ / /
* | | Bump yearXinchen Hui2014-01-031-1/+1
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2013-07-161-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: fix TS build
| * fix TS buildAnatol Belski2013-07-161-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-161-1/+1
|\ \ | |/
| * Make zval2myslqnd implementations aware of inheritanceJohannes Schlüter2013-07-161-1/+1
| |
* | Fix for Bug #64394 MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS undeclared when ↵Andrey Hristov2013-05-141-1/+1
| | | | | | | | using Connector/C
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2013-04-271-1/+1
|\ \ | |/
| * Fixed bug #64726 (Segfault when calling fetch_object on a use_result and DB ↵Xinchen Hui2013-04-271-1/+1
| | | | | | | | pointer has closed)
* | Add the constants needed for mysqli_commit(), _rollback() andAndrey Hristov2013-02-081-0/+10
| | | | | | | | begin_transaction()
* | Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-01-091-0/+3
|\ \ | |/
| * Add mysqli support - constants and checking in mysqli_options() for theAndrey Hristov2013-01-091-0/+3
| | | | | | | | new constant for password expriration
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | add a check for libmysqlAndrey Hristov2012-10-031-0/+2
| |
* | change public key setting to PERDIR and finish code that allowsandrey2012-09-251-0/+2
| | | | | | | | to set the key file programatically per mysqli_options()
* | Merge branch 'PHP-5.4'Stanislav Malyshev2012-06-301-1/+1
|\ \ | |/ | | | | | | * PHP-5.4: Fixed the common misspelling of the word occurred (occured -> occurred)
| * Fixed the common misspelling of the word occurred (occured -> occurred)Marc Easen2012-06-301-1/+1
| |
| * - Year++Felipe Pena2012-01-011-1/+1
| |
| * Move from directly referencing an aggregated structure to using aAndrey Hristov2011-10-251-0/+1
| | | | | | | | | | | | pointer to a structure. The structure is still aggregated but we add a level of indirection for possible plugins to overwrite the storage
| * api_ext to reverse_apiAndrey Hristov2011-10-191-6/+6
| |
| * - Use the proper variable here.Johannes Schlüter2011-09-211-1/+1
| |
| * use DBUG_ON flag for checking debugStanislav Malyshev2011-09-061-3/+3
| | | | | | | | | | # Some libmysql builds don't define DBUG_OFF and non-debug builds are more frequent
| * Fix #ifdef for mixed builds (ext/mysql using myslqnd, mysqli using libmysql)Johannes Schlüter2011-09-051-1/+1
| |
| * - Fix TSRM buildJohannes Schlüter2011-09-011-1/+1
| |
| * - Register extensions using mysqlnd (mysql, myslqi, pdo_mysql) with mysqlndJohannes Schlüter2011-08-311-0/+29
| |
| * - Added ZEND_MOD_END macro to use in the end of zend_module_dep[]Felipe Pena2011-08-061-1/+1
| |
| * compile out both parts of the code that are currently unused - fixes a ↵Andrey Hristov2011-08-021-2/+2
| | | | | | | | compilation warning