Skip to content

Commit 3306957

Browse files
committed
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3: Fix mysqli_release_savepoint() on mysqlnd
2 parents 9f2d039 + c3944c4 commit 3306957

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ext/mysqli/mysqli_nonapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
12611261
#if !defined(MYSQLI_USE_MYSQLND)
12621262
if (mysqli_savepoint_libmysql(mysql->mysql, name, TRUE)) {
12631263
#else
1264-
if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) {
1264+
if (FAIL == mysqlnd_release_savepoint(mysql->mysql, name)) {
12651265
#endif
12661266
RETURN_FALSE;
12671267
}

ext/mysqli/tests/mysqli_release_savepoint.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if (!have_innodb($link))
5050
printf("[009] Cannot turn off autocommit, expecting true, got %s/%s\n", gettype($tmp), $tmp);
5151

5252
/* note that there is no savepoint my... */
53-
if (true !== ($tmp = mysqli_release_savepoint($link, 'my')))
53+
if (false !== ($tmp = mysqli_release_savepoint($link, 'my')))
5454
printf("[010] Got %s - [%d] %s\n", var_dump($tmp, true), mysqli_errno($link), mysqli_error($link));
5555

5656
if (!mysqli_query($link, 'INSERT INTO test(id) VALUES (1)'))

0 commit comments

Comments
 (0)