Removed the server option --stat-tables.

Renamed the system variable optimizer_use_stat_tables to use_stat_tables.
This variable now has only 3 possible values:
'never', 'complementary', 'preferably'.
If the server has been launched with
--use-stat-tables='complementary'|'preferably'
then the statictics tables can be employed by the optimizer and by the
ANALYZE command. 

1 files changed, 7 insertions, 7 deletions

diff --git a/mysql-test/r/statistics.result b/mysql-test/r/statistics.result
index e4d6954c745..4e1a5a6733c 100644
--- a/mysql-test/r/statistics.result
+++ b/mysql-test/r/statistics.result
@@ -1,5 +1,5 @@
 drop table if exists t1,t2;
-set @save_optimizer_use_stat_tables=@@optimizer_use_stat_tables;
+set @save_use_stat_tables=@@use_stat_tables;
 CREATE VIEW table_stat AS
 SELECT * FROM mysql.table_stat;
 CREATE VIEW column_stat AS
@@ -16,7 +16,7 @@ CAST(avg_frequency AS decimal(12,4)) AS 'avg_frequency'
 DELETE FROM mysql.table_stat;
 DELETE FROM mysql.column_stat;
 DELETE FROM mysql.index_stat;
-set optimizer_use_stat_tables='preferably';
+set use_stat_tables='preferably';
 CREATE TABLE t1 (
 a int NOT NULL PRIMARY KEY,
 b varchar(32),
@@ -358,7 +358,7 @@ DROP TABLE t1,t2;
 DELETE FROM mysql.table_stat;
 DELETE FROM mysql.column_stat;
 DELETE FROM mysql.index_stat;
-set optimizer_use_stat_tables='never';
+set use_stat_tables='never';
 set names utf8;
 CREATE DATABASE world;
 use world;
@@ -387,7 +387,7 @@ Percentage float(3,1) NOT NULL default '0.0',
 PRIMARY KEY  (Country, Language),
 INDEX (Percentage)
 ) CHARACTER SET utf8 COLLATE utf8_bin;
-set optimizer_use_stat_tables='preferably';
+set use_stat_tables='preferably';
 ANALYZE TABLE Country, City, CountryLanguage;
 SELECT UPPER(db_name), UPPER(table_name), cardinality
 FROM test.table_stat;
@@ -424,7 +424,7 @@ WORLD	COUNTRYLANGUAGE	PRIMARY	1	4.2232
 WORLD	COUNTRYLANGUAGE	PRIMARY	2	1.0000
 WORLD	COUNTRYLANGUAGE	Percentage	1	2.7640
 use test;
-set optimizer_use_stat_tables='never';
+set use_stat_tables='never';
 CREATE DATABASE world_innodb;
 use world_innodb;
 CREATE TABLE Country (
@@ -455,7 +455,7 @@ INDEX (Percentage)
 ALTER TABLE Country ENGINE=InnoDB;
 ALTER TABLE City ENGINE=InnoDB;
 ALTER TABLE CountryLanguage ENGINE=InnoDB;
-set optimizer_use_stat_tables='preferably';
+set use_stat_tables='preferably';
 ANALYZE TABLE Country, City, CountryLanguage;
 SELECT UPPER(db_name), UPPER(table_name), cardinality
 FROM test.table_stat;
@@ -523,4 +523,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;
+set use_stat_tables=@save_use_stat_tables;