summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql/mysql_driver.c
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headers to 2017Sammy Kaye Powers2017-01-041-1/+1
|
* Do not edit the value in place (might be relates to #71261)Xinchen Hui2016-01-041-12/+9
|
* 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
* | Merge branch 'PHP-5.6'Xinchen Hui2015-08-301-23/+28
|\ \ | |/ | | | | | | | | Conflicts: ext/pdo/pdo_dbh.c ext/pdo/php_pdo_driver.h
* | Fixed bug #70272 (Segfault in pdo_mysql)Xinchen Hui2015-08-181-2/+0
| |
* | size_t cleanup for PDOStanislav Malyshev2015-01-261-11/+11
| |
* | Merge branch 'PHP-5.6'Anatol Belski2015-01-151-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | * PHP-5.6: updated NEWS updated NEWS PDO_MySQL: Differentiate between linux and win32 when passing unix_socket Conflicts: ext/pdo_mysql/mysql_driver.c
| * Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-01-151-3/+8
| |\ | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS PDO_MySQL: Differentiate between linux and win32 when passing unix_socket
| | * PDO_MySQL: Differentiate between linux and win32 when passing unix_socketsteffen2015-01-151-3/+8
| | | | | | | | | | | | | | | | | | Unix uses "127.0.0.1" as default host for named pipes, while when using Windows a "." is required as host by mysqlnd. (This can be seen at mysqlnd.c (line 945 or searching #ifndef PHP_WIN32)
| | * Bump yearXinchen Hui2015-01-151-1/+1
| | |
| * | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | bump yearXinchen Hui2015-01-151-1/+1
| | |
* | | trailing whitespace removalStanislav Malyshev2015-01-101-22/+22
| | |
* | | Merge branch 'PHP-5.6'Matteo Beccati2015-01-051-0/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
| * | Merge branch 'PHP-5.5' into PHP-5.6Matteo Beccati2015-01-051-0/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.5: Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific attribute names
| | * Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵Matteo Beccati2015-01-051-0/+1
| | |\ | | | | | | | | | | | | attribute names
| | | * Fixed bug #68371 PDO#getAttribute() cannot be called with platform-specific ↵Matteo Beccati2014-11-101-0/+1
| | | | | | | | | | | | | | | | attribute names
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-46/+46
| | | |
* | | | 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.6'Julien Pauli2014-12-051-2/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * 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-051-2/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: Updated NEWS Start adding new attribute to control multi statements
| | * | Start adding new attribute to control multi statementspwolanin2014-12-051-2/+6
| | |/
| | * Bump yearXinchen Hui2014-01-031-1/+1
| | |
* | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-191-1/+1
| | |
* | | master renames phase 7PRE_AST_MERGEAnatol Belski2014-08-251-1/+1
| | |
* | | master renames phase 1Anatol Belski2014-08-251-24/+24
| | |
* | | ported from pdo - pgsql, odbc, mysql, firebirt, dblibAnatol Belski2014-08-191-9/+9
| | |
* | | basic macro replacements, all at onceAnatol Belski2014-08-191-18/+18
| | |
* | | clean up - avoid reallocXinchen Hui2014-08-131-5/+4
| | |
* | | Fixed pdo_mysql build with mysqlndXinchen Hui2014-06-191-1/+2
| | |
* | | Refactor pdo_mysql(incompleted, some tests failed due to no mysqlnd)Xinchen Hui2014-05-071-10/+15
| | |
* | | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-261-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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]
* | | Cleanup (1-st round)Dmitry Stogov2014-04-151-1/+1
|/ /
* | Bump yearXinchen Hui2014-01-031-1/+1
|/
* Fix bug 65299Johannes Schlüter2013-07-231-1/+1
|
* Merge branch 'PHP-5.4' into PHP-5.5Johannes Schlüter2013-07-231-3/+3
|\
| * Fix compiler warning on redefined constantJohannes Schlüter2013-07-231-3/+3
| |
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Allow setting SHA256 auth public key as optionJohannes Schlüter2012-10-311-1/+15
| |
* | Merge branch 'PHP-5.4'Xinchen Hui2012-10-091-0/+0
|\ \ | |/
| * Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2012-10-091-0/+0
| |\
| | * Fixed bug #63236 (Executable permission on various source files)Xinchen Hui2012-10-091-0/+0
| | |
| | * Fix bug #61194 PDO should export compression flag with myslqndJohannes Schlüter2012-03-051-3/+2
| | |
View Lorry Controller Status