diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 16:03:26 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-09-17 16:03:26 +0200 |
| commit | 33069575d57965b3456cf1b21b81d3c9db7e456f (patch) | |
| tree | 294edca1c0b5eba8cb0bffefbdc8e676d1cfa426 | |
| parent | 9f2d03952daf5348d7f18c18e82607979e28df12 (diff) | |
| parent | c3944c4c4f66188e6dd5a6ed0f9e1364c701b736 (diff) | |
| download | php-git-33069575d57965b3456cf1b21b81d3c9db7e456f.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix mysqli_release_savepoint() on mysqlnd
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_release_savepoint.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index fdacd74d2a..582ce79553 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -1261,7 +1261,7 @@ PHP_FUNCTION(mysqli_release_savepoint) #if !defined(MYSQLI_USE_MYSQLND) if (mysqli_savepoint_libmysql(mysql->mysql, name, TRUE)) { #else - if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) { + if (FAIL == mysqlnd_release_savepoint(mysql->mysql, name)) { #endif RETURN_FALSE; } diff --git a/ext/mysqli/tests/mysqli_release_savepoint.phpt b/ext/mysqli/tests/mysqli_release_savepoint.phpt index e6417288d4..8f395ef6f8 100644 --- a/ext/mysqli/tests/mysqli_release_savepoint.phpt +++ b/ext/mysqli/tests/mysqli_release_savepoint.phpt @@ -50,7 +50,7 @@ if (!have_innodb($link)) printf("[009] Cannot turn off autocommit, expecting true, got %s/%s\n", gettype($tmp), $tmp); /* note that there is no savepoint my... */ - if (true !== ($tmp = mysqli_release_savepoint($link, 'my'))) + if (false !== ($tmp = mysqli_release_savepoint($link, 'my'))) printf("[010] Got %s - [%d] %s\n", var_dump($tmp, true), mysqli_errno($link), mysqli_error($link)); if (!mysqli_query($link, 'INSERT INTO test(id) VALUES (1)')) |