summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-091-1/+2
|\ | | | | | | | | | | | | * PHP-7.0: Fixed bug #72788 (Invalid memory access when using persistent PDO connection) Remove typo'd commit Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
| * Remove typo'd commitKeyur2016-08-091-1/+0
| |
| * Fix bug 72788: Invalid memory access when database_object_handleKeyur2016-08-092-1/+3
| | | | | | | | | | is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
* | Fixed compilation warningsDmitry Stogov2016-06-221-2/+6
| |
* | Merge branch 'PHP-7.0'Nikita Popov2016-03-032-2/+2
|\ \ | |/
| * Move semicolon into TSRMLS_CACHE_EXTERN/DEFINENikita Popov2016-03-032-2/+2
| | | | | | | | Also re bug #71575.
* | Merge branch 'PHP-7.0'Nikita Popov2016-02-131-1/+1
|\ \ | |/
| * Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-02-131-1/+1
| |\
| | * Fix test descriptionNikita Popov2016-02-131-1/+1
| | |
* | | Merge branch 'PHP-7.0'Nikita Popov2016-02-131-0/+23
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Nikita Popov2016-02-131-0/+23
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/pdo_mysql/mysql_driver.c
| | * FIx bug #71569Nikita Popov2016-02-132-13/+36
| | | | | | | | | | | | convert_to_string() may result in an interned string.
* | | Remove version checksNikita Popov2016-01-302-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP_VERSION_ID PHP_API_VERSION ZEND_MODULE_API_NO PHP_MAJOR_VERSION, PHP_MINOR_VERSION ZEND_ENGINE_2 I've left litespeed alone, as it seems to genuinely maintain support for many PHP versions.
* | | Merge branch 'PHP-7.0'Xinchen Hui2016-01-041-12/+9
|\ \ \ | |/ /
| * | Do not edit the value in place (might be relates to #71261)Xinchen Hui2016-01-041-12/+9
| | |
* | | Merge branch 'PHP-7.0'Lior Kaplan2016-01-015-5/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-7.0: Update header to PHP Version 7 Happy new year (Update copyright to 2016) Happy new year (Update copyright to 2016)
| * | Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-015-5/+5
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| | * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-015-5/+5
| | |
* | | Merge branch 'PHP-7.0'Julien Pauli2015-12-241-0/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: Fixed and improved tests test to function socket_getopt(); test to function socket_clear_error();; test to function socket_shutdown(); test to function socket_send(); test to function gethostname ( void ); test to function DateTimeZone::getLocation(); test to function stream_get_transports(); test to function stream_get_wrappers(); test to function stream_socket_enable_crypto(); test to function stream_socket_get_name(); Create stream_socket_recvfrom.phpt test to stream function set_file_buffer.phpt(); test to function PDO_getAvaliableDrivers; test to misc. function connection_status(); test to function connection_aborted(); test to function memory_get_peak_usage();
| * | Merge branch 'PHP-5.6' into PHP-7.0Julien Pauli2015-12-241-0/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Fixed and improved tests test to function socket_getopt(); test to function socket_clear_error();; test to function socket_shutdown(); test to function socket_send(); test to function gethostname ( void ); test to function DateTimeZone::getLocation(); test to function stream_get_transports(); test to function stream_get_wrappers(); test to function stream_socket_enable_crypto(); test to function stream_socket_get_name(); Create stream_socket_recvfrom.phpt test to stream function set_file_buffer.phpt(); test to function PDO_getAvaliableDrivers; test to misc. function connection_status(); test to function connection_aborted(); test to function memory_get_peak_usage();
| | * Fixed and improved testsJulien Pauli2015-12-241-1/+1
| | |
| | * test to function PDO_getAvaliableDrivers;marcosptf2015-12-241-0/+11
| | | | | | | | | | | | was add new function to PDO::getAvailableDrivers
* | | Merge branch 'PHP-7.0'Xinchen Hui2015-11-161-0/+2
|\ \ \ | |/ /
| * | 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
| | * Fix bug #64172Daniel Persson2015-10-181-2/+2
| | | | | | | | | | | | | | | Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver. And if no error is reported skip the extra call to the driver.
* | | MNDR:Andrey Hristov2015-11-121-3/+3
|/ / | | | | | | | | | | - cleanup in mysqlnd_result.c - switch from zend_ulong to size_t for lengths. Accordingly change mysqli and pdo_mysql for this.
* | use Z* macro nameAnatol Belski2015-11-051-1/+1
| |
* | fix leakAnatol Belski2015-11-051-0/+1
| |
* | fix pdo_mysql crash with empty bound stream paramAnatol Belski2015-11-052-2/+49
| | | | | | | | rel #70862
* | Fix bug #64172Daniel Persson2015-10-181-2/+2
| | | | | | | | | | Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver. And if no error is reported skip the extra call to the driver.
* | Fixed test running on MarinaDB.Dmitry Stogov2015-10-071-1/+1
| |
* | Merge branch 'PHP-5.6'Xinchen Hui2015-08-302-23/+61
|\ \ | |/ | | | | | | | | Conflicts: ext/pdo/pdo_dbh.c ext/pdo/php_pdo_driver.h
| * Fixed bug #70389 (PDO constructor changes unrelated variables)Xinchen Hui2015-08-301-0/+33
| |
* | fork testAnatol Belski2015-08-202-0/+82
| |
* | Fixed bug #70272 (Segfault in pdo_mysql)Xinchen Hui2015-08-183-4/+33
| |
* | switch to the unified globals accessor where appropriateAnatol Belski2015-07-291-6/+2
| |
* | Various warning fixesNikita Popov2015-07-171-1/+6
| |
* | Update exception names in tests after formatting changes.Aaron Piotrowski2015-05-176-6/+6
| |
* | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-05-176-6/+6
|\ \
| * | Tweak uncaught exception message displayNikita Popov2015-05-176-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements a reduced variant of #1226 with just the following change: -Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d +Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d The '' wrapper around messages is very weird if the exception message itself contains ''. Futhermore having the message wrapped in '' doesn't work for the "and defined" suffix of TypeExceptions.
* | | Updated tests to reflect exception class changes.Aaron Piotrowski2015-05-168-8/+8
|/ /
* | Display EngineExceptions like ordinary exceptionsNikita Popov2015-05-156-6/+26
| | | | | | | | | | | | | | | | | | TypeException stays as-is for now because it uses messages that are incompatible with the way exception messages are displayed. closure_038.phpt and a few others now show that we're generating too many exceptions for compound operations on undefined properties -- this needs to be fixed in a followup.
* | Use zend_string to represent pdo_column_data.name and avoid duplication.Dmitry Stogov2015-05-051-5/+2
| |
* | Always throw TypeException on throwing zpp failuresNikita Popov2015-04-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a ZEND_PARSE_PARAMS_THROW flag for zpp, which forces to report FAILURE errors using a TypeException instead of a Warning, like it would happen in strict mode. Adds a zend_parse_parameters_throw() convenience function, which invokes zpp with this flag. Converts all cases I could identify, where we currently have throwing zpp usage in constructors and replaces them with this API. Error handling is still replaced to EH_THROW in some cases to handle other, domain-specific errors in constructors.
* | Try fixing PDO MySQL pconnect testNikita Popov2015-04-041-0/+3
| | | | | | | | | | | | | | | | | | Use less aggressive conversion to exceptions, in particular do not convert warnings that happen during check_liveness. If the server has gone away this will just reconnect and we still end up with a valid connection, so it shouldn't throw. Also drop some unnecessary checks for malloc returning NULL.
* | Merge branch 'PHP-5.6'Ferenc Kovacs2015-04-021-1/+1
|\ \ | |/ | | | | | | * PHP-5.6: sigh, can't even copypaste without screwing up
| * Merge branch 'PHP-5.5' into PHP-5.6Ferenc Kovacs2015-04-021-1/+1
| |\ | | | | | | | | | | | | * PHP-5.5: sigh, can't even copypaste without screwing up
| | * sigh, can't even copypaste without screwing upFerenc Kovacs2015-04-021-1/+1
| | |
* | | Merge branch 'PHP-5.6'Ferenc Kovacs2015-04-011-0/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-5.6: oop, put both the error number and message for both db object to the error message
View Lorry Controller Status