summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema
diff options
context:
space:
mode:
authorJunqi Xie <junqi_xie@outlook.com>2023-03-12 13:55:30 +0800
committerDaniel Black <daniel@mariadb.org>2023-04-12 11:04:29 +1000
commitd20a96f9c1c0240eac2ad8520a04f06e218c4e0a (patch)
tree2a9bfbd680ebe5079c29dbf11225d249ea1d490b /mysql-test/suite/perfschema
parent4472a7b4ff79853d931288c1ab8d49bf130e3908 (diff)
downloadmariadb-git-d20a96f9c1c0240eac2ad8520a04f06e218c4e0a.tar.gz
MDEV-21921 Make transaction_isolation and transaction_read_only into system variables
In MariaDB, we have a confusing problem where: * The transaction_isolation option can be set in a configuration file, but it cannot be set dynamically. * The tx_isolation system variable can be set dynamically, but it cannot be set in a configuration file. Therefore, we have two different names for the same thing in different contexts. This is needlessly confusing, and it complicates the documentation. The same thing applys for transaction_read_only. MySQL 5.7 solved this problem by making them into system variables. https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-20.html This commit takes a similar approach by adding new system variables and marking the original ones as deprecated. This commit also resolves some legacy problems related to SET STATEMENT and transaction_isolation.
Diffstat (limited to 'mysql-test/suite/perfschema')
-rw-r--r--mysql-test/suite/perfschema/r/transaction.result8
-rw-r--r--mysql-test/suite/perfschema/t/transaction.test4
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/perfschema/r/transaction.result b/mysql-test/suite/perfschema/r/transaction.result
index 9a7eb5b3eb5..c516a4543c2 100644
--- a/mysql-test/suite/perfschema/r/transaction.result
+++ b/mysql-test/suite/perfschema/r/transaction.result
@@ -39,8 +39,8 @@ CALL clear_transaction_tables();
# ========================================================================
#
connection con1;
-SELECT @@global.tx_isolation;
-@@global.tx_isolation
+SELECT @@global.transaction_isolation;
+@@global.transaction_isolation
REPEATABLE-READ
SELECT @@global.autocommit;
@@global.autocommit
@@ -48,8 +48,8 @@ SELECT @@global.autocommit;
SELECT @@global.binlog_format;
@@global.binlog_format
ROW
-SELECT @@tx_isolation;
-@@tx_isolation
+SELECT @@transaction_isolation;
+@@transaction_isolation
REPEATABLE-READ
SELECT @@autocommit;
@@autocommit
diff --git a/mysql-test/suite/perfschema/t/transaction.test b/mysql-test/suite/perfschema/t/transaction.test
index b616460374e..d950139f7d6 100644
--- a/mysql-test/suite/perfschema/t/transaction.test
+++ b/mysql-test/suite/perfschema/t/transaction.test
@@ -90,10 +90,10 @@ CALL clear_transaction_tables();
--echo # ========================================================================
--echo #
--connection con1
-SELECT @@global.tx_isolation;
+SELECT @@global.transaction_isolation;
SELECT @@global.autocommit;
SELECT @@global.binlog_format;
-SELECT @@tx_isolation;
+SELECT @@transaction_isolation;
SELECT @@autocommit;
SELECT @@binlog_format;