Skip to content

Commit e9ac7d2

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix mysqli_release_savepoint() on mysqlnd
2 parents 86e0027 + 3306957 commit e9ac7d2

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
@@ -1250,7 +1250,7 @@ PHP_FUNCTION(mysqli_release_savepoint)
12501250
#ifndef MYSQLI_USE_MYSQLND
12511251
if (mysqli_savepoint_libmysql(mysql->mysql, name, TRUE)) {
12521252
#else
1253-
if (FAIL == mysqlnd_savepoint(mysql->mysql, name)) {
1253+
if (FAIL == mysqlnd_release_savepoint(mysql->mysql, name)) {
12541254
#endif
12551255
RETURN_FALSE;
12561256
}

ext/mysqli/tests/mysqli_release_savepoint.phpt

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

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

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

0 commit comments

Comments
 (0)