summaryrefslogtreecommitdiff
path: root/ext/mysqli/mysqli_nonapi.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-011-1/+1
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-011-1/+1
| |
* | Merge branch 'PHP-5.6' into PHP-7.0Xinchen Hui2015-11-161-0/+2
|\ \ | |/ | | | | | | Conflicts: ext/mysql/php_mysql.c
| * Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)Xinchen Hui2015-11-161-0/+2
| | | | | | | | Actually, this only be fixed if php uses mysqlnd
| * bump yearXinchen Hui2015-01-151-1/+1
| |
* | Cleanup (replce hack by a clean implementation)Dmitry Stogov2015-07-011-1/+1
| |
* | Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-5/+5
| | | | | | | | semantick changes).
* | bump yearXinchen Hui2015-01-151-1/+1
| |
* | trailing whitespace removalStanislav Malyshev2015-01-101-8/+8
| |
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-70/+70
| |
* | Move smart_str implementation into Zend/Nikita Popov2014-09-211-1/+1
| | | | | | | | | | | | | | | | So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h.
* | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| |
* | 's' works with size_t round 2Anatol Belski2014-08-271-2/+2
| |
* | first show to make 's' work with size_tAnatol Belski2014-08-271-5/+5
| |
* | master renames phase 1Anatol Belski2014-08-251-26/+26
| |
* | fixes to %pd format usageAnatol Belski2014-08-241-2/+2
| |
* | ported ext/mysqliAnatol Belski2014-08-191-13/+13
| |
* | basic macro replacements, all at onceAnatol Belski2014-08-191-13/+13
| |
* | Fixed mysqli_get_links_statsXinchen Hui2014-06-191-3/+3
| |
* | Fixed hash key in persistent hashXinchen Hui2014-06-191-1/+1
| |
* | Fixed MySQLi built with mysqlndXinchen Hui2014-06-191-31/+23
| |
* | Refactor MySQLi (incompleted, only compilable now)Xinchen Hui2014-05-111-104/+66
| |
* | Merge branch 'master' into refactoring2Dmitry Stogov2014-05-051-0/+8
|\ \ | |/ | | | | | | | | Conflicts: Zend/zend_hash.c ext/date/php_date.c
| * Fix mysqli build when building against libmysqlclient.Adam Harvey2014-05-021-0/+8
| |
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-25/+53
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20/+26
| |\ | | | | | | | | | | | | Conflicts: ext/mysqli/tests/mysqli_begin_transaction.phpt
| | * Merge branch 'PHP-5.5' into PHP-5.6Andrey Hristov2014-03-201-20/+26
| | |\
| | | * Emit a warning in case of unallowed characters. Fix another place thisAndrey Hristov2014-03-201-20/+26
| | | | | | | | | | | | | | | | code is used - reuse
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| * | | New result fetching mode for mysqlnd, which should use less memory butAndrey Hristov2014-04-101-5/+10
| |/ / | | | | | | | | | | | | | | | | | | | | | 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]
| * | Add new INI for rollbacking connections put back into the pconn poolAndrey Hristov2014-01-291-0/+17
| | | | | | | | | | | | | | | as well a function get the the statistics in easier way than ob_start() and parsing phpinfo().
* | | Cleanup (1-st round)Dmitry Stogov2014-04-151-12/+12
|/ /
* | Bump yearXinchen Hui2014-01-031-1/+1
|/
* Merge branch 'PHP-5.4' into PHP-5.5Andrey Hristov2013-12-041-1/+1
|\
| * Fix loss of precisionAndrey Hristov2013-12-041-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-031-2/+2
|\ \ | |/ | | | | | | Conflicts: Zend/acinclude.m4
| * Make sure result is initilizedJohannes Schlüter2013-07-031-2/+2
| | | | | | | | | | Practically this could only be an issue when overriding mysqlnd from an extension, but makes static analysis happy
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | relax the checkAndrey Hristov2013-02-221-1/+1
| |
* | Add some parameter checksAndrey Hristov2013-02-221-5/+22
| |
* | mysqli_savepoint()/mysqli_release_savepoint()Andrey Hristov2013-02-081-1/+70
| |
* | Add support for begin_transaction in libmysql mode.Andrey Hristov2013-02-071-0/+76
| | | | | | | | Add support for flags and name for commit/rollback in libmysql mode
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Xinchen Hui2012-11-301-2/+8
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-11-301-2/+8
| |\
| | * Fixed bug #63398 (Segfault when polling closed link)Xinchen Hui2012-11-301-2/+8
| | |
* | | Add SHA256 authentication support - password hashing to mysqlndandrey2012-09-251-1/+1
| | | | | | | | | | | | Automatic switchover to SSL with plain-text password is not part of this
* | | Merge branch 'PHP-5.4'Xinchen Hui2012-08-221-0/+5
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-08-221-0/+5
| |\ \ | | |/
| | * Fixed bug #62885 (mysqli_poll - Segmentation fault)Xinchen Hui2012-08-221-0/+5
| | |
View Lorry Controller Status