summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Krivonos <sergei.krivonos@mariadb.com>2021-10-28 18:35:33 +0300
committerSergei Krivonos <sergei.krivonos@mariadb.com>2021-10-28 18:41:05 +0300
commitfcca0c67b65ba9b869f545b94a4e287a5ec1152d (patch)
treef1a4248b128c27274cc518f309f17f3ecb7a06c0
parent3a79e5fd317316c293baa459e8296fdb0744c280 (diff)
downloadmariadb-git-fcca0c67b65ba9b869f545b94a4e287a5ec1152d.tar.gz
MDEV-26929: fixed opt_trace test for --mysqld=--optimizer_trace=enabled=onbb-10.4-MDEV-26929
-rw-r--r--mysql-test/main/opt_trace.result6
-rw-r--r--mysql-test/main/opt_trace.test2
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/opt_trace.result b/mysql-test/main/opt_trace.result
index c16df0da0b2..f2b69fb1eaa 100644
--- a/mysql-test/main/opt_trace.result
+++ b/mysql-test/main/opt_trace.result
@@ -4,14 +4,14 @@ OPTIMIZER_TRACE QUERY
OPTIMIZER_TRACE TRACE
OPTIMIZER_TRACE MISSING_BYTES_BEYOND_MAX_MEM_SIZE
OPTIMIZER_TRACE INSUFFICIENT_PRIVILEGES
-show variables like 'optimizer_trace';
-Variable_name Value
-optimizer_trace enabled=off
set optimizer_trace="enabled=on";
show variables like 'optimizer_trace';
Variable_name Value
optimizer_trace enabled=on
set optimizer_trace="enabled=off";
+show variables like 'optimizer_trace';
+Variable_name Value
+optimizer_trace enabled=off
create table t1 (a int, b int);
insert into t1 values (1,2),(2,3);
create table t2 (b int);
diff --git a/mysql-test/main/opt_trace.test b/mysql-test/main/opt_trace.test
index 1dfb7e5ce8a..2084940fbc5 100644
--- a/mysql-test/main/opt_trace.test
+++ b/mysql-test/main/opt_trace.test
@@ -1,10 +1,10 @@
--source include/not_embedded.inc
--source include/have_sequence.inc
SELECT table_name, column_name FROM information_schema.columns where table_name="OPTIMIZER_TRACE";
-show variables like 'optimizer_trace';
set optimizer_trace="enabled=on";
show variables like 'optimizer_trace';
set optimizer_trace="enabled=off";
+show variables like 'optimizer_trace';
create table t1 (a int, b int);
insert into t1 values (1,2),(2,3);