summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-01-04 18:32:21 -0800
committerIgor Babaev <igor@askmonty.org>2012-01-04 18:32:21 -0800
commit7895f510a4019a8b96e447ca95b4e1ee4a9b6272 (patch)
treec75c7ff8d57035174ab4852afeb1481218f63e77
parente8497370b9557e77c0a791f89712a6ae8505f925 (diff)
downloadmariadb-git-7895f510a4019a8b96e447ca95b4e1ee4a9b6272.tar.gz
In statistics.test:
Saved at the very beginning and restored at the very end the value of optimizer_use_stat_tables.
-rw-r--r--mysql-test/r/statistics.result2
-rw-r--r--mysql-test/t/statistics.test5
2 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/r/statistics.result b/mysql-test/r/statistics.result
index 424dec3bb9d..59af26014c6 100644
--- a/mysql-test/r/statistics.result
+++ b/mysql-test/r/statistics.result
@@ -1,4 +1,5 @@
drop table if exists t1,t2;
+set @save_optimizer_use_stat_tables=@@optimizer_use_stat_tables;
CREATE VIEW table_stat AS
SELECT * FROM mysql.table_stat;
CREATE VIEW column_stat AS
@@ -453,3 +454,4 @@ DELETE FROM mysql.index_stat;
DROP VIEW test.table_stat;
DROP VIEW test.column_stat;
DROP VIEW test.index_stat;
+set optimizer_use_stat_tables=@save_optimizer_use_stat_tables;
diff --git a/mysql-test/t/statistics.test b/mysql-test/t/statistics.test
index 9ea57aca14a..0a32fcde881 100644
--- a/mysql-test/t/statistics.test
+++ b/mysql-test/t/statistics.test
@@ -3,6 +3,8 @@
drop table if exists t1,t2;
--enable_warnings
+set @save_optimizer_use_stat_tables=@@optimizer_use_stat_tables;
+
CREATE VIEW table_stat AS
SELECT * FROM mysql.table_stat;
@@ -286,5 +288,6 @@ DROP VIEW test.table_stat;
DROP VIEW test.column_stat;
DROP VIEW test.index_stat;
-
+set optimizer_use_stat_tables=@save_optimizer_use_stat_tables;
+
\ No newline at end of file