summaryrefslogtreecommitdiff
path: root/ext/pdo_mysql
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Fix test cases for MariaDBDharman2020-12-113-85/+57
| | | | | | | | | | | | | | | | | | And remove unnecessary try-catch. Closes GH-6505.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-105-36/+38
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #72368
| * | Fixed bug #72368Nikita Popov2020-12-105-36/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a param count mismatch error even if the query contains no placeholders. Additionally we shouldn't HANDLE errors from pdo_parse_params, which are always reported via raise_impl_error. Doing so results in duplicate error messages.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-102-2/+5
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #79131
| * | Fixed bug #79131Nikita Popov2020-12-102-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a driver reports an error during EVT_ALLOC (and some over EVTs), make sure we handle it as usual, i.e. warn or throw. This requires some adjustments in PDO PgSQL to stop manually doing this through an impl error. Unfortunately the PDO PgSQL error messages regress because of this, as they now include a completely arbitrary error code. There doesn't seem to be an ability to skip it right now.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-102-6/+40
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #79872 by improving error message
| * | Fixed bug #79872 by improving error messageNikita Popov2020-12-102-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | The actual behavior here is correct, but the previous error message was misleading, as neither fetchAll() nor buffered queries would help in this situation. Instead it is necessary to consume all rowsets, which can be done by either unsetting the statement or calling closeCursor().
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-101-0/+33
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #76815
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-12-101-0/+33
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fixed bug #76815
| | * Fixed bug #76815Nikita Popov2020-12-101-0/+33
| | | | | | | | | | | | | | | | | | When we receive an error while reading a result set, we should assume that no more result sets are available. libmysqlclient implements the same behavior.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-101-0/+25
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #71145
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-12-101-0/+25
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fixed bug #71145
| | * Fixed bug #71145Nikita Popov2020-12-101-0/+25
| | | | | | | | | | | | Consume any additional result sets when running INIT_COMMAND.
| | * Backport fix for bug #70066Nikita Popov2020-12-103-10/+34
| | | | | | | | | | | | | | | | | | | | | Given the number of duplicates this bug report had, it seems worthwhile to fix this on PHP-7.4 as well. Cherry-pick of 106e7e4bca7c0fd975eb219b18e3c34957ba8657.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-093-10/+34
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #70066
| * | Fixed bug #70066Nikita Popov2020-12-093-10/+34
| | | | | | | | | | | | | | | If we fall back to emulated prepared statements, destroy S->stmt, so the code doesn't get confused about which mode we're in.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-093-1/+45
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #66878
| * | Fixed bug #66878Nikita Popov2020-12-093-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep track of whether we have fully consumed all result sets, either using nextRowset() calls or closeCursor() and skip the attempt to consume remaining results sets during destruction in that case. Especiall if closeCursor() has been used, we really shouldn't have this sort of cross-statement inference.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-091-17/+3
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-8.0: Remove unnecessary more_results() checks Add ifdef for mysqlnd only function
| * | Remove unnecessary more_results() checksNikita Popov2020-12-091-17/+1
| | | | | | | | | | | | Just calling next_result() is sufficient.
| * | Add ifdef for mysqlnd only functionNikita Popov2020-12-091-0/+2
| | |
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-091-54/+29
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-8.0: PDO MySQL: Extract common code for handling PS results PDO MySQL: Use set_row_count() helper
| * | PDO MySQL: Extract common code for handling PS resultsNikita Popov2020-12-091-46/+28
| | |
| * | PDO MySQL: Use set_row_count() helperNikita Popov2020-12-091-9/+2
| | |
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-092-16/+18
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: PDO MySQL: Make sure nextRowset() works with partially consumed result
| * | PDO MySQL: Make sure nextRowset() works with partially consumed resultNikita Popov2020-12-092-16/+18
| | | | | | | | | | | | | | | | | | This was already working in all cases apart from native prepared statements with unbuffered queries. In that case invoking stmt_free_result() addresses the issue.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-092-1/+32
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: PDO MySQL: Handle error during closeCursor()
| * | PDO MySQL: Handle error during closeCursor()Nikita Popov2020-12-092-1/+32
| | |
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-092-1/+35
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #78154
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-12-092-1/+35
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fixed bug #78154
| | * Fixed bug #78154Nikita Popov2020-12-092-1/+35
| | | | | | | | | | | | Handle errors during next_result in exec.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-092-5/+1
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-8.0: Fix stmt_free_result implementation and usage Make XFAILED test less broken
| * | Fix stmt_free_result implementation and usageNikita Popov2020-12-092-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two bugs both affecting the bug_pecl_7976.phpt test ("works with mysqlnd" haha): * We should not change the connection state in stmt_free_result. This makes mysql_stmt_free_result usable under mysqlnd and not just libmysqlclient. * If we call mysql_stmt_free_result, we still need to consume any outstanding result sets.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-091-6/+2
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Handle changing column count in mysqlnd result binding
| * | Handle changing column count in mysqlnd result bindingNikita Popov2020-12-091-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the count changes from prepare to execute and result_bind is alreadly allocated, reallocate it there. This is something of a hack. It would be cleaner to require that result bindings are registered only after execute, when the final result set fields are known. But mysqli at least directly exposes this to the user, so we have no guarantee.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-086-36/+66
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: PDO MySQL: Normalize handling of empty stored procedure result set
| * | PDO MySQL: Normalize handling of empty stored procedure result setNikita Popov2020-12-086-36/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL always returns a trailing empty result set for stored procedure calls, which is used to convey status information. The PDO MySQL implementation is presently confused about what to do with it: If mysqlnd is used and native prepared statements are used, this result set is skipped. In all other cases it is not skipped. We also have quite a few XFAILed tests relating to this. This patch normalizes (for PHP-8.0 only) the behavior towards always retaining the empty result set. This is simply how MySQL stored procedures work (some expletives omitted here) and we can't distinguish this "useless" result set from an empty result of a multi query. Multi queries are not a concern for native prepared statements, as PDO does not allow them in that case, but they are a concern for emulated prepared statements. Closes GH-6497.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-082-7/+64
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Handle column count change in PDO MySQL
| * | Handle column count change in PDO MySQLNikita Popov2020-12-082-7/+64
| | | | | | | | | | | | | | | | | | | | | | | | This has been fixed for PDO SQlite by GH-4313, however the same issue also applied to PDO MySQL. Move the column count setting function into the main PDO layer (and export it) and then use it in both PDO SQLite and PDO MySQL.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-081-4/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Enable XFAILed test
| * | Enable XFAILed testNikita Popov2020-12-081-4/+1
| | | | | | | | | | | | | | | This one had a rather scary XFAIL message, but seems to work just fine...
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-082-0/+68
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #63185
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-12-082-0/+68
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fixed bug #63185
| | * Fixed bug #63185Nikita Popov2020-12-082-0/+68
| | |
* | | Merge branch 'PHP-8.0'Nikita Popov2020-12-042-10/+195
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fixed bug #80458
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-12-042-10/+195
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fixed bug #80458
| | * Fixed bug #80458Dharman2020-12-042-11/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no result set (e.g. for upsert queries), still allow fetching to occur without error, i.e. treat it the same way as an empty result set. This normalizes behavior between native and emulated prepared statements and addresses a regression in PHP 7.4.13.
* | | Merge branch 'PHP-8.0'Nikita Popov2020-11-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-8.0: Fix #80312: change default engine from MyISAM to InnoDB in tests
| * | Merge branch 'PHP-7.4' into PHP-8.0Nikita Popov2020-11-171-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-7.4: Fix #80312: change default engine from MyISAM to InnoDB in tests
| | * Fix #80312: change default engine from MyISAM to InnoDB in testsDarek Slusarczyk2020-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | Change mysqli and pdo_mysql tests configuration to use by default InnoDB instead of MyISAM. Closes GH-6405.
View Lorry Controller Status