diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/main/ps.test | |
parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/main/ps.test')
-rw-r--r-- | mysql-test/main/ps.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/ps.test b/mysql-test/main/ps.test index c7568f73..bf223850 100644 --- a/mysql-test/main/ps.test +++ b/mysql-test/main/ps.test @@ -766,13 +766,13 @@ prepare stmt from "select @@time_zone"; execute stmt; set @@time_zone:='Japan'; execute stmt; -prepare stmt from "select @@tx_isolation"; +prepare stmt from "select @@transaction_isolation"; execute stmt; set transaction isolation level read committed; execute stmt; set transaction isolation level serializable; execute stmt; -set @@tx_isolation=default; +set @@transaction_isolation=default; execute stmt; deallocate prepare stmt; |