diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q01.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q01.sql
index 70bee6b036fe12..7362ea39b23bf1 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q01.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q01.sql
@@ -1,27 +1,27 @@
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'Database') OR array_contains(body, 'Database') ORDER BY id;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM articles_uk_array WHERE array_contains(title, 'database') OR array_contains(body, 'database');
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'Tutorial') OR array_contains(body, 'Tutorial') ORDER BY id;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'MySQL') OR array_contains(body, 'MySQL') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'Database') OR array_contains(body, 'Database') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM articles_uk_array WHERE array_contains(title, 'database') OR array_contains(body, 'database');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'Tutorial') OR array_contains(body, 'Tutorial') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'MySQL') OR array_contains(body, 'MySQL') ORDER BY id;
 
 -- NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(IF(array_contains(title, 'database') OR array_contains(body, 'database'), 1, NULL)) as count FROM articles_uk_array;
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(IF(array_contains(title, 'database') OR array_contains(body, 'database'), 1, NULL)) as count FROM articles_uk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE (array_contains(title, 'MySQL') AND NOT array_contains(title, 'YourSQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE (array_contains(title, 'MySQL') AND NOT array_contains(title, 'YourSQL')) 
                             OR (array_contains(body, 'MySQL') AND NOT array_contains(body, 'YourSQL')) ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'DBMS Security') OR array_contains(body, 'DBMS Security') ORDER BY id;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'MySQL YourSQL') OR array_contains(body, 'MySQL YourSQL') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'DBMS Security') OR array_contains(body, 'DBMS Security') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE array_contains(title, 'MySQL YourSQL') OR array_contains(body, 'MySQL YourSQL') ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE (array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE (array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
                             AND NOT (array_contains(title, 'Well stands') OR array_contains(body, 'Well stands')) ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE (array_contains(title, 'YourSQL') OR array_contains(body, 'YourSQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE (array_contains(title, 'YourSQL') OR array_contains(body, 'YourSQL')) 
                             OR ((array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
                                 AND NOT (array_contains(title, 'Tricks Security') OR array_contains(body, 'Tricks Security'))) ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE ((array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE ((array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
                                 AND NOT (array_contains(title, 'Tricks Security') OR array_contains(body, 'Tricks Security')))
                            AND NOT (array_contains(title, 'YourSQL') OR array_contains(body, 'YourSQL')) ORDER BY id;
 
 -- match phrase, NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_uk_array WHERE title MATCH_PHRASE 'following database' OR body MATCH_PHRASE 'following database';
\ No newline at end of file
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_uk_array WHERE title MATCH_PHRASE 'following database' OR body MATCH_PHRASE 'following database';
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q02.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q02.sql
index 558d2b9bf4d753..c6106ee24b17da 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q02.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/basic_q02.sql
@@ -1,27 +1,27 @@
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'Database') OR array_contains(body, 'Database') ORDER BY id;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM articles_dk_array WHERE array_contains(title, 'database') OR array_contains(body, 'database');
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'Tutorial') OR array_contains(body, 'Tutorial') ORDER BY id;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'MySQL') OR array_contains(body, 'MySQL') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'Database') OR array_contains(body, 'Database') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM articles_dk_array WHERE array_contains(title, 'database') OR array_contains(body, 'database');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'Tutorial') OR array_contains(body, 'Tutorial') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'MySQL') OR array_contains(body, 'MySQL') ORDER BY id;
 
 -- NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(IF(array_contains(title, 'database') OR array_contains(body, 'database'), 1, NULL)) as count FROM articles_dk_array;
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(IF(array_contains(title, 'database') OR array_contains(body, 'database'), 1, NULL)) as count FROM articles_dk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE (array_contains(title, 'MySQL') AND NOT array_contains(title, 'YourSQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE (array_contains(title, 'MySQL') AND NOT array_contains(title, 'YourSQL')) 
                             OR (array_contains(body, 'MySQL') AND NOT array_contains(body, 'YourSQL')) ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'DBMS Security') OR array_contains(body, 'DBMS Security') ORDER BY id;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'MySQL YourSQL') OR array_contains(body, 'MySQL YourSQL') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'DBMS Security') OR array_contains(body, 'DBMS Security') ORDER BY id;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE array_contains(title, 'MySQL YourSQL') OR array_contains(body, 'MySQL YourSQL') ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE (array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE (array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
                             AND NOT (array_contains(title, 'Well stands') OR array_contains(body, 'Well stands')) ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE (array_contains(title, 'YourSQL') OR array_contains(body, 'YourSQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE (array_contains(title, 'YourSQL') OR array_contains(body, 'YourSQL')) 
                             OR ((array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
                                 AND NOT (array_contains(title, 'Tricks Security') OR array_contains(body, 'Tricks Security'))) ORDER BY id;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE ((array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE ((array_contains(title, 'MySQL') OR array_contains(body, 'MySQL')) 
                                 AND NOT (array_contains(title, 'Tricks Security') OR array_contains(body, 'Tricks Security')))
                            AND NOT (array_contains(title, 'YourSQL') OR array_contains(body, 'YourSQL')) ORDER BY id;
 
 -- match phrase, NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM articles_dk_array WHERE title MATCH_PHRASE 'following database' OR body MATCH_PHRASE 'following database';
\ No newline at end of file
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM articles_dk_array WHERE title MATCH_PHRASE 'following database' OR body MATCH_PHRASE 'following database';
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q01.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q01.sql
index 79b75171f554bb..6e8f0b1ac9bfe3 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q01.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q01.sql
@@ -1,40 +1,40 @@
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'collections' OR array_contains(b, 'collections') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'indexes' OR array_contains(b, 'indexes') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'indexes collections' OR array_contains(b, 'indexes collections') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'only' OR array_contains(b, 'only') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'collections' OR array_contains(b, 'collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'indexes' OR array_contains(b, 'indexes') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'indexes collections' OR array_contains(b, 'indexes collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'only' OR array_contains(b, 'only') ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'support' OR array_contains(b, 'support'))
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'support' OR array_contains(b, 'support'))
                     AND NOT (a MATCH_ANY 'collections' OR array_contains(b, 'collections')) ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'support  collections' OR array_contains(b, 'support  collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'support  collections' OR array_contains(b, 'support  collections') ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) 
                     AND (a MATCH_ANY 'collections' OR array_contains(b, 'collections')) ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ALL 'support collections' OR array_contains(b, 'support collections') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'search' OR array_contains(b, 'search') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ALL 'support collections' OR array_contains(b, 'support collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY 'search' OR array_contains(b, 'search') ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
                     AND (a MATCH_ANY 'support vector' OR array_contains(b, 'support vector')) ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
                     AND NOT (a MATCH_ANY 'support vector' OR array_contains(b, 'support vector')) ORDER BY a;
 
 -- NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ *, (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) AS x FROM  fulltext_t1_uk;
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ *, (a MATCH_ANY 'collections support' OR array_contains(b, 'collections support')) AS x FROM  fulltext_t1_uk;
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ *, (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) AS x FROM  fulltext_t1_uk;
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ *, (a MATCH_ANY 'collections support' OR array_contains(b, 'collections support')) AS x FROM  fulltext_t1_uk;
 
 
 -- match phrase, NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_PHRASE 'support now' OR b MATCH_PHRASE 'support now';
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_PHRASE 'Now sUPPort' OR b MATCH_PHRASE 'Now sUPPort';
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_PHRASE 'now   support' OR b MATCH_PHRASE 'now   support';
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_PHRASE 'support now' OR b MATCH_PHRASE 'support now';
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_PHRASE 'Now sUPPort' OR b MATCH_PHRASE 'Now sUPPort';
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_PHRASE 'now   support' OR b MATCH_PHRASE 'now   support';
 
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
 --                        OR (a MATCH_PHRASE 'now support' OR b MATCH_PHRASE 'now support');
 
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
 --                        AND NOT (a MATCH_PHRASE 'now support' OR b MATCH_PHRASE 'now support');
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY '"space model' OR array_contains(b, '"space model') ORDER BY a;
\ No newline at end of file
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_uk_array WHERE a MATCH_ANY '"space model' OR array_contains(b, '"space model') ORDER BY a;
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q02.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q02.sql
index 04a52f77dae6fb..818c605d87f7db 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q02.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/fulltext_q02.sql
@@ -1,40 +1,40 @@
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'collections' OR array_contains(b, 'collections') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'indexes' OR array_contains(b, 'indexes') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'indexes collections' OR array_contains(b, 'indexes collections') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'only' OR array_contains(b, 'only') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'collections' OR array_contains(b, 'collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'indexes' OR array_contains(b, 'indexes') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'indexes collections' OR array_contains(b, 'indexes collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'only' OR array_contains(b, 'only') ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'support' OR array_contains(b, 'support'))
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'support' OR array_contains(b, 'support'))
                     AND NOT (a MATCH_ANY 'collections' OR array_contains(b, 'collections')) ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'support  collections' OR array_contains(b, 'support  collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'support  collections' OR array_contains(b, 'support  collections') ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) 
                     AND (a MATCH_ANY 'collections' OR array_contains(b, 'collections')) ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ALL 'support collections' OR array_contains(b, 'support collections') ORDER BY a;
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'search' OR array_contains(b, 'search') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ALL 'support collections' OR array_contains(b, 'support collections') ORDER BY a;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY 'search' OR array_contains(b, 'search') ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
                     AND (a MATCH_ANY 'support vector' OR array_contains(b, 'support vector')) ORDER BY a;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_ANY 'search' OR array_contains(b, 'search')) 
                     AND NOT (a MATCH_ANY 'support vector' OR array_contains(b, 'support vector')) ORDER BY a;
 
 -- NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ *, (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) AS x FROM  fulltext_t1_dk;
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ *, (a MATCH_ANY 'collections support' OR array_contains(b, 'collections support')) AS x FROM  fulltext_t1_dk;
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ *, (a MATCH_ANY 'support collections' OR array_contains(b, 'support collections')) AS x FROM  fulltext_t1_dk;
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ *, (a MATCH_ANY 'collections support' OR array_contains(b, 'collections support')) AS x FROM  fulltext_t1_dk;
 
 
 -- match phrase, NOT SUPPORT:
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_PHRASE 'support now' OR b MATCH_PHRASE 'support now';
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_PHRASE 'Now sUPPort' OR b MATCH_PHRASE 'Now sUPPort';
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_PHRASE 'now   support' OR b MATCH_PHRASE 'now   support';
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_PHRASE 'support now' OR b MATCH_PHRASE 'support now';
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_PHRASE 'Now sUPPort' OR b MATCH_PHRASE 'Now sUPPort';
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_PHRASE 'now   support' OR b MATCH_PHRASE 'now   support';
 
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
 --                        OR (a MATCH_PHRASE 'now support' OR b MATCH_PHRASE 'now support');
 
--- SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
+-- SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE (a MATCH_PHRASE 'text search' OR b MATCH_PHRASE 'text search')
 --                        AND NOT (a MATCH_PHRASE 'now support' OR b MATCH_PHRASE 'now support');
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY '"space model' OR array_contains(b, '"space model') ORDER BY a;
\ No newline at end of file
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ * FROM fulltext_t1_dk_array WHERE a MATCH_ANY '"space model' OR array_contains(b, '"space model') ORDER BY a;
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q01.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q01.sql
index e98a4853460ab1..9526c41cbec4fc 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q01.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q01.sql
@@ -1,34 +1,34 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ FTS_DOC_ID FROM large_records_t1_uk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49') order by FTS_DOC_ID;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ FTS_DOC_ID FROM large_records_t1_uk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49') order by FTS_DOC_ID;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'))
         AND (a MATCH_ANY 'row5col1word49' OR array_contains(b, 'row5col1word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE a MATCH_ANY 'row5col2word49' OR  array_contains(b, 'row5col2word49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
         AND (a MATCH_ANY 'row35col1word49 row35col2word40' OR array_contains(b, 'row35col1word49 row35col2word40'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
         AND NOT (a MATCH_ANY 'row45col2word49' OR array_contains(b, 'row45col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE a MATCH_ANY 'row5col2word49' OR  array_contains(b, 'row5col2word40');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE a MATCH_ANY 'row35col2word49' OR  array_contains(b, 'row35col2word49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_uk_array
         WHERE a MATCH_ANY 'ROW35col2WORD49' OR  array_contains(b, 'ROW35col2WORD49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ a,b FROM large_records_t1_uk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ a,b FROM large_records_t1_uk_array
         WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'))
         AND (a MATCH_ANY 'row5col1word49' OR array_contains(b, 'row5col1word49')) ORDER BY FTS_DOC_ID;
 
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q02.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q02.sql
index 44606c49cfece8..746f4cdae7ba63 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q02.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q02.sql
@@ -1,34 +1,34 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ FTS_DOC_ID FROM large_records_t1_dk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49') order by FTS_DOC_ID;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ FTS_DOC_ID FROM large_records_t1_dk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49') order by FTS_DOC_ID;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'))
         AND (a MATCH_ANY 'row5col1word49' OR array_contains(b, 'row5col1word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE a MATCH_ANY 'row5col2word49' OR  array_contains(b, 'row5col2word49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
         AND (a MATCH_ANY 'row35col1word49 row35col2word40' OR array_contains(b, 'row35col1word49 row35col2word40'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
         AND NOT (a MATCH_ANY 'row45col2word49' OR array_contains(b, 'row45col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE a MATCH_ANY 'row5col2word49' OR  array_contains(b, 'row5col2word40');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE a MATCH_ANY 'row35col2word49' OR  array_contains(b, 'row35col2word49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t1_dk_array
         WHERE a MATCH_ANY 'ROW35col2WORD49' OR  array_contains(b, 'ROW35col2WORD49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ a,b FROM large_records_t1_dk_array
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ a,b FROM large_records_t1_dk_array
         WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'))
         AND (a MATCH_ANY 'row5col1word49' OR array_contains(b, 'row5col1word49')) ORDER BY FTS_DOC_ID;
 
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q03.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q03.sql
index 21cf33e32ec2b7..9e5467d5017ca2 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q03.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q03.sql
@@ -1,28 +1,28 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ FTS_DOC_ID FROM large_records_t2_uk_array WHERE array_contains(b, 'row30col2word30');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ FTS_DOC_ID FROM large_records_t2_uk_array WHERE array_contains(b, 'row30col2word30');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ FTS_DOC_ID FROM large_records_t2_uk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ FTS_DOC_ID FROM large_records_t2_uk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array 
     WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'))
     AND (a MATCH_ANY 'row5col1word49' OR array_contains(b, 'row5col1word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array 
     WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array 
     WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
     AND (a MATCH_ANY 'row35col1word49 row35col2word40' OR array_contains(b, 'row35col1word49 row35col2word40'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array 
     WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
     AND NOT (a MATCH_ANY 'row45col2word49' OR array_contains(b, 'row45col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array 
     WHERE a MATCH_ANY 'row5col2word49 row5col2word40' OR array_contains(b, 'row5col2word49 row5col2word40');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_uk_array 
     WHERE a MATCH_ALL 'ROW35col2WORD49' OR array_contains(b, 'ROW35col2WORD49');
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q04.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q04.sql
index 07ed01e8214499..8a4aa8e8cdd674 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q04.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q04.sql
@@ -1,28 +1,28 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ FTS_DOC_ID FROM large_records_t2_dk_array WHERE array_contains(b, 'row30col2word30');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ FTS_DOC_ID FROM large_records_t2_dk_array WHERE array_contains(b, 'row30col2word30');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ FTS_DOC_ID FROM large_records_t2_dk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ FTS_DOC_ID FROM large_records_t2_dk_array WHERE a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array 
     WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'))
     AND (a MATCH_ANY 'row5col1word49' OR array_contains(b, 'row5col1word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array 
     WHERE (a MATCH_ANY 'row5col2word49' OR array_contains(b, 'row5col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array 
     WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
     AND (a MATCH_ANY 'row35col1word49 row35col2word40' OR array_contains(b, 'row35col1word49 row35col2word40'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array 
     WHERE (a MATCH_ANY 'row35col2word49' OR array_contains(b, 'row35col2word49'))
     AND NOT (a MATCH_ANY 'row45col2word49' OR array_contains(b, 'row45col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array 
     WHERE a MATCH_ANY 'row5col2word49 row5col2word40' OR array_contains(b, 'row5col2word49 row5col2word40');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t2_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t2_dk_array 
     WHERE a MATCH_ALL 'ROW35col2WORD49' OR array_contains(b, 'ROW35col2WORD49');
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q05.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q05.sql
index 0f8c868354f1b4..82dc0e8475cbb3 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q05.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q05.sql
@@ -1,18 +1,18 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_uk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_uk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_uk_array WHERE array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_uk_array WHERE array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_uk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_uk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_uk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_uk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND NOT (a MATCH_ANY 'row45col2word49' OR array_contains(b, 'row45col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_uk_array 
     WHERE (a MATCH_ANY 'sameroww' OR array_contains(b, 'sameroww'));
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q06.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q06.sql
index e90491cd3b046a..c4a8a68874adf9 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q06.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q06.sql
@@ -1,18 +1,18 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_dk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_dk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_dk_array WHERE array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_dk_array WHERE array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_dk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_dk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_dk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_dk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND NOT (a MATCH_ANY 'row45col2word49' OR array_contains(b, 'row45col2word49'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t3_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t3_dk_array 
     WHERE (a MATCH_ANY 'sameroww' OR array_contains(b, 'sameroww'));
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q07.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q07.sql
index 493eb09405d832..8f97eb7899578e 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q07.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q07.sql
@@ -1,17 +1,17 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_uk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_uk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_uk_array WHERE array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_uk_array WHERE array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_uk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_uk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_uk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND (a MATCH_ANY '1050' OR array_contains(b, '1050'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_uk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_uk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND NOT (a MATCH_ANY '1050' OR array_contains(b, '1050'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_uk_array WHERE a MATCH_ANY '2001' OR array_contains(b, '2001');
\ No newline at end of file
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_uk_array WHERE a MATCH_ANY '2001' OR array_contains(b, '2001');
\ No newline at end of file
diff --git a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q08.sql b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q08.sql
index 94c8de6600366d..ae0f2f43d524dd 100644
--- a/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q08.sql
+++ b/regression-test/suites/mysql_fulltext_array_contains/sql/large_records_q08.sql
@@ -1,17 +1,17 @@
 
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_dk_array;
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_dk_array;
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_dk_array WHERE array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_dk_array WHERE array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_dk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_dk_array WHERE a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword');
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_dk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND (a MATCH_ANY '1050' OR array_contains(b, '1050'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_dk_array 
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_dk_array 
     WHERE (a MATCH_ANY 'samerowword' OR array_contains(b, 'samerowword'))
     AND NOT (a MATCH_ANY '1050' OR array_contains(b, '1050'));
 
-SELECT/*+SET_VAR(enable_common_expr_pushdown=true,enable_common_expr_pushdown_for_inverted_index=true)*/ COUNT(*) FROM large_records_t4_dk_array WHERE a MATCH_ANY '2001' OR array_contains(b, '2001');
\ No newline at end of file
+SELECT/*+SET_VAR(enable_common_expr_pushdown=true)*/ COUNT(*) FROM large_records_t4_dk_array WHERE a MATCH_ANY '2001' OR array_contains(b, '2001');
\ No newline at end of file