5.1-bugteam->5.5-bugteam merge

Sergey Glukhov · Sergey Glukhov · commit 9715545d8300 · 2010-12-14T13:46:00.000+03:00
--BZR--
revision-id: sergey.glukhov@oracle.com-20101214104600-v0ndu721rf61nbml
property-branch-nick: mysql-5.5-bugteam
property-file-info: ld7:file_id67:sp1f-derived.result-20020326130604-7h5qgv4t7i62th7ufm74tv3o2mtgqoqg7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path27:mysql-test/r/derived.resulted7:file_id72:sp1f-multi_update.result-20010611232825-7f2vetuxiyd3bu5lefd5a2ze43xed33y7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path32:mysql-test/r/multi_update.resulted7:file_id64:sp1f-view.result-20040715221517-nqk3l34grrhprjiitidhfjyjqlgh6a5v7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path24:mysql-test/r/view.resulted7:file_id54:innodb_multi_update.-20100505110047-w87u39xlb6di17k1-27:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path52:mysql-test/suite/innodb/r/innodb_multi_update.resulted7:file_id54:innodb_multi_update.-20100505110047-w87u39xlb6di17k1-17:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path50:mysql-test/suite/innodb/t/innodb_multi_update.tested7:file_id65:sp1f-derived.test-20020326130604-mdjuldldv4iv2xqkrt4c4xbvxdwnljpw7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path25:mysql-test/t/derived.tested7:file_id70:sp1f-multi_update.test-20010611232825-wkkm3vvyawipiowjzwqmkqegx6wd6aiw7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path30:mysql-test/t/multi_update.tested7:file_id62:sp1f-view.test-20040715221517-2kxb7l4itrpl4mw266xe5gby4vftru3z7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path22:mysql-test/t/view.tested7:file_id60:sp1f-item.cc-19700101030959-u7hxqopwpfly4kf5ctlyk2dvrq4l3dhn7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path11:sql/item.cced7:file_id68:sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path19:sql/item_cmpfunc.cced7:file_id65:sp1f-item_func.cc-19700101030959-3wmsx76yvc25sroqpfrx2n77kqdxxn3y7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path16:sql/item_func.cced7:file_id64:sp1f-item_row.cc-20021115183204-24uyecwm52gv5pn6jtszpqpfufhwmisq7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path15:sql/item_row.cced7:file_id70:sp1f-item_subselect.cc-20020512204640-qep43aqhsfrwkqmrobni6czc3fqj36oo7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path21:sql/item_subselect.cced7:file_id69:sp1f-item_subselect.h-20020512204640-qdg77wil56cxyhtc2bjjdrppxq3wqgh37:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path20:sql/item_subselect.hed7:file_id64:sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path15:sql/sql_class.hed7:file_id67:sp1f-sql_derived.cc-20020326130604-4qz6ovo2xa6w5eslbmcx76agmnyyvsfh7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path18:sql/sql_derived.cced7:file_id63:sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path14:sql/sql_lex.cced7:file_id62:sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path13:sql/sql_lex.hed7:file_id65:sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path16:sql/sql_parse.cced7:file_id67:sp1f-sql_prepare.cc-20020612210720-gtqjjiu7vpmfxb5xct2qke7urmqcabli7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path18:sql/sql_prepare.cced7:file_id65:sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path14:sql/sql_priv.hed7:file_id66:sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path17:sql/sql_select.cced7:file_id64:sp1f-sql_show.cc-19700101030959-umlljfnpplg452h7reeyqr4xnbmlkvfj7:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path15:sql/sql_show.cced7:file_id64:sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe47:message30:5.1-bugteam-&gt;5.5-bugteam merge4:path15:sql/sql_view.ccee
testament3-sha1: 35ea9e75debb24d9e42c99751d44786b30804eb2
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
@@ -400,4 +400,15 @@ SELECT 0 FROM
 (SELECT 0) t61;
 0
 0
+#
+#  A nested materialized derived table is used before being populated.
+#  (addon for bug#19077)
+#
+CREATE TABLE t1 (i INT, j BIGINT);
+INSERT INTO t1 VALUES (1, 2), (2, 2), (3, 2);
+SELECT * FROM (SELECT MIN(i) FROM t1
+WHERE j = SUBSTRING('12', (SELECT * FROM (SELECT MIN(j) FROM t1) t2))) t3;
+MIN(i)
+1
+DROP TABLE t1;
 # End of 5.0 tests
diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
@@ -669,4 +669,15 @@ Error	1242	Subquery returns more than 1 row
 Error	1242	Subquery returns more than 1 row
 DROP TABLE t1, t2, t3;
 SET SESSION sql_safe_updates = DEFAULT;
+#
+# Bug#52157 various crashes and assertions with multi-table update, stored function
+#
+CREATE FUNCTION f1 () RETURNS BLOB RETURN 1;
+CREATE TABLE t1 (f1 DATE);
+INSERT INTO t1 VALUES('2001-01-01');
+UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1;
+Warnings:
+Warning	1292	Truncated incorrect datetime value: '1'
+DROP FUNCTION f1;
+DROP TABLE t1;
 end of tests
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result
@@ -3999,6 +3999,19 @@ CREATE VIEW v1 AS SELECT 1 from t1
 WHERE t1.b <=> (SELECT a FROM t1 WHERE a < SOME(SELECT '1'));
 DROP VIEW v1;
 DROP TABLE t1;
+#
+# Bug#57703 create view cause Assertion failed: 0, file .\item_subselect.cc, line 846
+#
+CREATE TABLE t1(a int);
+CREATE VIEW v1 AS SELECT 1 FROM t1 GROUP BY
+SUBSTRING(1 FROM (SELECT 3 FROM t1 WHERE a >= ANY(SELECT 1)));
+DROP VIEW v1;
+DROP TABLE t1;
+#
+# Bug#57352 valgrind warnings when creating view
+#
+CREATE VIEW v1 AS SELECT 1 IN (1 LIKE 2,0) AS f;
+DROP VIEW v1;
 # -----------------------------------------------------------------
 # -- End of 5.1 tests.
 # -----------------------------------------------------------------
diff --git a/mysql-test/suite/innodb/r/innodb_multi_update.result b/mysql-test/suite/innodb/r/innodb_multi_update.result
@@ -74,3 +74,11 @@ a	b
 4	14
 5	15
 drop table bug38999_1,bug38999_2;
+#
+# Bug#54475 improper error handling causes cascading crashing failures in innodb/ndb
+#
+CREATE TABLE t1(f1 INT) ENGINE=INNODB;
+INSERT INTO t1 VALUES(1);
+UPDATE (SELECT ((SELECT 1 FROM t1), 1) FROM t1 WHERE (SELECT 1 FROM t1)) x, (SELECT 1) AS d SET d.f1 = 1;
+ERROR 21000: Operand should contain 1 column(s)
+DROP TABLE t1;
diff --git a/mysql-test/suite/innodb/t/innodb_multi_update.test b/mysql-test/suite/innodb/t/innodb_multi_update.test
@@ -27,3 +27,12 @@ select * from bug38999_1;
 select * from bug38999_2;
 
 drop table bug38999_1,bug38999_2;
+
+--echo #
+--echo # Bug#54475 improper error handling causes cascading crashing failures in innodb/ndb
+--echo #
+CREATE TABLE t1(f1 INT) ENGINE=INNODB;
+INSERT INTO t1 VALUES(1);
+--error ER_OPERAND_COLUMNS
+UPDATE (SELECT ((SELECT 1 FROM t1), 1) FROM t1 WHERE (SELECT 1 FROM t1)) x, (SELECT 1) AS d SET d.f1 = 1;
+DROP TABLE t1;
diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test
@@ -301,4 +301,15 @@ SELECT 0 FROM
 (SELECT 0) t56, (SELECT 0) t57, (SELECT 0) t58, (SELECT 0) t59, (SELECT 0) t60,
 (SELECT 0) t61; # 61 == MAX_TABLES
 
+--echo #
+--echo #  A nested materialized derived table is used before being populated.
+--echo #  (addon for bug#19077)
+--echo #
+
+CREATE TABLE t1 (i INT, j BIGINT);
+INSERT INTO t1 VALUES (1, 2), (2, 2), (3, 2);
+SELECT * FROM (SELECT MIN(i) FROM t1
+WHERE j = SUBSTRING('12', (SELECT * FROM (SELECT MIN(j) FROM t1) t2))) t3;
+DROP TABLE t1;
+
 --echo # End of 5.0 tests
diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test
@@ -672,4 +672,15 @@ SET t3.a = 0;
 DROP TABLE t1, t2, t3;
 SET SESSION sql_safe_updates = DEFAULT;
 
+--echo #
+--echo # Bug#52157 various crashes and assertions with multi-table update, stored function
+--echo #
+
+CREATE FUNCTION f1 () RETURNS BLOB RETURN 1;
+CREATE TABLE t1 (f1 DATE);
+INSERT INTO t1 VALUES('2001-01-01');
+UPDATE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1;
+DROP FUNCTION f1;
+DROP TABLE t1;
+
 --echo end of tests
diff --git a/mysql-test/t/view.test b/mysql-test/t/view.test
@@ -3963,6 +3963,22 @@ WHERE t1.b <=> (SELECT a FROM t1 WHERE a < SOME(SELECT '1'));
 DROP VIEW v1;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#57703 create view cause Assertion failed: 0, file .\item_subselect.cc, line 846
+--echo #
+
+CREATE TABLE t1(a int);
+CREATE VIEW v1 AS SELECT 1 FROM t1 GROUP BY
+SUBSTRING(1 FROM (SELECT 3 FROM t1 WHERE a >= ANY(SELECT 1)));
+DROP VIEW v1;
+DROP TABLE t1;
+
+--echo #
+--echo # Bug#57352 valgrind warnings when creating view
+--echo #
+CREATE VIEW v1 AS SELECT 1 IN (1 LIKE 2,0) AS f;
+DROP VIEW v1;
+
 --echo # -----------------------------------------------------------------
 --echo # -- End of 5.1 tests.
 --echo # -----------------------------------------------------------------
diff --git a/sql/item.cc b/sql/item.cc
@@ -1812,16 +1812,7 @@ bool agg_item_set_converter(DTCollation &coll, const char *fname,
 
     if (!(conv= (*arg)->safe_charset_converter(coll.collation)) &&
         ((*arg)->collation.repertoire == MY_REPERTOIRE_ASCII))
-    {
-      /*
-        We should disable const subselect item evaluation because
-        subselect transformation does not happen in view_prepare_mode
-        and thus val_...() methods can not be called for const items.
-      */
-      bool resolve_const= ((*arg)->type() == Item::SUBSELECT_ITEM &&
-                           thd->lex->view_prepare_mode) ? FALSE : TRUE;
-      conv= new Item_func_conv_charset(*arg, coll.collation, resolve_const);
-    }
+      conv= new Item_func_conv_charset(*arg, coll.collation, 1);
 
     if (!conv)
     {
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -403,7 +403,7 @@ static bool convert_constant_item(THD *thd, Item_field *field_item,
   Field *field= field_item->field;
   int result= 0;
 
-  if (!(*item)->with_subselect && (*item)->const_item())
+  if ((*item)->const_item())
   {
     TABLE *table= field->table;
     ulonglong orig_sql_mode= thd->variables.sql_mode;
@@ -499,7 +499,7 @@ void Item_bool_func2::fix_length_and_dec()
   }
 
   thd= current_thd;
-  if (!thd->is_context_analysis_only())
+  if (!thd->lex->is_ps_or_view_context_analysis())
   {
     if (args[0]->real_item()->type() == FIELD_ITEM)
     {
@@ -803,7 +803,7 @@ Arg_comparator::can_compare_as_dates(Item *a, Item *b, ulonglong *const_value)
       confuse storage engines since in context analysis mode tables 
       aren't locked.
     */
-    if (!thd->is_context_analysis_only() &&
+    if (!thd->lex->is_ps_or_view_context_analysis() &&
         cmp_type != CMP_DATE_WITH_DATE && str_arg->const_item() &&
         (str_arg->type() != Item::FUNC_ITEM ||
         ((Item_func*)str_arg)->functype() != Item_func::GUSERVAR_FUNC))
@@ -1036,7 +1036,7 @@ Item** Arg_comparator::cache_converted_constant(THD *thd_arg, Item **value,
                                                 Item_result type)
 {
   /* Don't need cache if doing context analysis only. */
-  if (!thd_arg->is_context_analysis_only() &&
+  if (!thd->lex->is_ps_or_view_context_analysis() &&
       (*value)->const_item() && type != (*value)->result_type())
   {
     Item_cache *cache= Item_cache::get_cache(*value, type);
@@ -4714,7 +4714,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref)
     return TRUE;
   }
   
-  if (escape_item->const_item() && !thd->lex->view_prepare_mode)
+  if (escape_item->const_item())
   {
     /* If we are on execution stage */
     String *escape_str= escape_item->val_str(&cmp.value1);
diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -6492,7 +6492,7 @@ Item_func_sp::fix_fields(THD *thd, Item **ref)
   if (res)
     DBUG_RETURN(res);
 
-  if (thd->lex->view_prepare_mode)
+  if (thd->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW)
   {
     /*
       Here we check privileges of the stored routine only during view
diff --git a/sql/item_row.cc b/sql/item_row.cc
@@ -80,12 +80,8 @@ bool Item_row::fix_fields(THD *thd, Item **ref)
     used_tables_cache |= item->used_tables();
     const_item_cache&= item->const_item() && !with_null;
     not_null_tables_cache|= item->not_null_tables();
-    /*
-      Some subqueries transformations aren't done in the view_prepare_mode thus
-      is_null() will fail. So we skip is_null() calculation for CREATE VIEW as
-      not necessary.
-    */
-    if (const_item_cache && !thd->lex->view_prepare_mode)
+
+    if (const_item_cache)
     {
       if (item->cols() > 1)
 	with_null|= item->null_inside();
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
@@ -131,20 +131,6 @@ void Item_subselect::cleanup()
 }
 
 
-/*
-   We cannot use generic Item::safe_charset_converter() because
-   Subselect transformation does not happen in view_prepare_mode
-   and thus we can not evaluate val_...() for const items.
-*/
-
-Item *Item_subselect::safe_charset_converter(CHARSET_INFO *tocs)
-{
-  Item_func_conv_charset *conv=
-    new Item_func_conv_charset(this, tocs, thd->lex->view_prepare_mode ? 0 : 1);
-  return conv->safe ? conv : NULL;
-}
-
-
 void Item_singlerow_subselect::cleanup()
 {
   DBUG_ENTER("Item_singlerow_subselect::cleanup");
@@ -279,6 +265,7 @@ bool Item_subselect::exec()
   if (thd->is_error() || thd->killed)
     return 1;
 
+  DBUG_ASSERT(!thd->lex->context_analysis_only);
   /*
     Simulate a failure in sub-query execution. Used to test e.g.
     out of memory or query being killed conditions.
@@ -315,7 +302,7 @@ table_map Item_subselect::used_tables() const
 
 bool Item_subselect::const_item() const
 {
-  return const_item_cache;
+  return thd->lex->context_analysis_only ? FALSE : const_item_cache;
 }
 
 Item *Item_subselect::get_tmp_table_item(THD *thd_arg)
@@ -1646,7 +1633,8 @@ bool Item_in_subselect::fix_fields(THD *thd_arg, Item **ref)
 {
   bool result = 0;
   
-  if (thd_arg->lex->view_prepare_mode && left_expr && !left_expr->fixed)
+  if ((thd_arg->lex->context_analysis_only & CONTEXT_ANALYSIS_ONLY_VIEW) &&
+      left_expr && !left_expr->fixed)
     result = left_expr->fix_fields(thd_arg, &left_expr);
 
   return result || Item_subselect::fix_fields(thd_arg, ref);
diff --git a/sql/item_subselect.h b/sql/item_subselect.h
@@ -138,7 +138,6 @@ class Item_subselect :public Item_result_field
   virtual void reset_value_registration() {}
   enum_parsing_place place() { return parsing_place; }
   bool walk(Item_processor processor, bool walk_subquery, uchar *arg);
-  Item *safe_charset_converter(CHARSET_INFO *tocs);
 
   /**
     Get the SELECT_LEX structure associated with this Item.
diff --git a/sql/sql_class.h b/sql/sql_class.h
@@ -2503,8 +2503,6 @@ class THD :public Statement,
              (variables.sql_mode & MODE_STRICT_ALL_TABLES)));
   }
   void set_status_var_init();
-  bool is_context_analysis_only()
-    { return stmt_arena->is_stmt_prepare() || lex->view_prepare_mode; }
   void reset_n_backup_open_tables_state(Open_tables_backup *backup);
   void restore_backup_open_tables_state(Open_tables_backup *backup);
   void reset_sub_statement_state(Sub_statement_state *backup, uint new_state);
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
@@ -151,10 +151,11 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list)
     if (!(derived_result= new select_union))
       DBUG_RETURN(TRUE); // out of memory
 
+    lex->context_analysis_only|= CONTEXT_ANALYSIS_ONLY_DERIVED;
     // st_select_lex_unit::prepare correctly work for single select
     if ((res= unit->prepare(thd, derived_result, 0)))
       goto exit;
-
+    lex->context_analysis_only&= ~CONTEXT_ANALYSIS_ONLY_DERIVED;
     if ((res= check_duplicate_names(unit->types, 0)))
       goto exit;
 
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
@@ -383,7 +383,7 @@ void lex_start(THD *thd)
   lex->select_lex.group_list.empty();
   lex->describe= 0;
   lex->subqueries= FALSE;
-  lex->view_prepare_mode= FALSE;
+  lex->context_analysis_only= 0;
   lex->derived_tables= 0;
   lex->safe_to_cache_query= 1;
   lex->leaf_tables_insert= 0;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
@@ -2286,19 +2286,12 @@ struct LEX: public Query_tables_list
   uint8 derived_tables;
   uint8 create_view_algorithm;
   uint8 create_view_check;
+  uint8 context_analysis_only;
   bool drop_if_exists, drop_temporary, local_file, one_shot_set;
   bool autocommit;
   bool verbose, no_write_to_binlog;
 
   enum enum_yes_no_unknown tx_chain, tx_release;
-  /*
-    Special JOIN::prepare mode: changing of query is prohibited.
-    When creating a view, we need to just check its syntax omitting
-    any optimizations: afterwards definition of the view will be
-    reconstructed by means of ::print() methods and written to
-    to an .frm file. We need this definition to stay untouched.
-  */
-  bool view_prepare_mode;
   bool safe_to_cache_query;
   bool subqueries, ignore;
   st_parsing_options parsing_options;
@@ -2403,6 +2396,13 @@ struct LEX: public Query_tables_list
     delete_dynamic(&plugins);
   }
 
+  inline bool is_ps_or_view_context_analysis()
+  {
+    return (context_analysis_only &
+            (CONTEXT_ANALYSIS_ONLY_PREPARE |
+             CONTEXT_ANALYSIS_ONLY_VIEW));
+  }
+
   inline void uncacheable(uint8 cause)
   {
     safe_to_cache_query= 0;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
@@ -5295,13 +5295,6 @@ mysql_new_select(LEX *lex, bool move_down)
     DBUG_RETURN(1);
   }
   select_lex->nest_level= lex->nest_level;
-  /*
-    Don't evaluate this subquery during statement prepare even if
-    it's a constant one. The flag is switched off in the end of
-    mysqld_stmt_prepare.
-  */
-  if (thd->stmt_arena->is_stmt_prepare())
-    select_lex->uncacheable|= UNCACHEABLE_PREPARE;
   if (move_down)
   {
     SELECT_LEX_UNIT *unit;
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
diff --git a/sql/sql_view.cc b/sql/sql_view.cc

Original file line number	Diff line number	Diff line change
`@@ -400,4 +400,15 @@ SELECT 0 FROM`
`400`	`400`	`(SELECT 0) t61;`
`401`	`401`	`0`
`402`	`402`	`0`
	`403`	`+#`
	`404`	`+# A nested materialized derived table is used before being populated.`
	`405`	`+# (addon for bug#19077)`
	`406`	`+#`
	`407`	`+CREATE TABLE t1 (i INT, j BIGINT);`
	`408`	`+INSERT INTO t1 VALUES (1, 2), (2, 2), (3, 2);`
	`409`	`+SELECT * FROM (SELECT MIN(i) FROM t1`
	`410`	`+WHERE j = SUBSTRING('12', (SELECT * FROM (SELECT MIN(j) FROM t1) t2))) t3;`
	`411`	`+MIN(i)`
	`412`	`+1`
	`413`	`+DROP TABLE t1;`
`403`	`414`	`# End of 5.0 tests`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ static bool convert_constant_item(THD thd, Item_field field_item,`
`403`	`403`	`Field *field= field_item->field;`
`404`	`404`	`int result= 0;`
`405`	`405`
`406`		`- if (!(item)->with_subselect && (item)->const_item())`
	`406`	`+ if ((*item)->const_item())`
`407`	`407`	`{`
`408`	`408`	`TABLE *table= field->table;`
`409`	`409`	`ulonglong orig_sql_mode= thd->variables.sql_mode;`
`@@ -499,7 +499,7 @@ void Item_bool_func2::fix_length_and_dec()`
`499`	`499`	`}`
`500`	`500`
`501`	`501`	`thd= current_thd;`
`502`		`- if (!thd->is_context_analysis_only())`
	`502`	`+ if (!thd->lex->is_ps_or_view_context_analysis())`
`503`	`503`	`{`
`504`	`504`	`if (args[0]->real_item()->type() == FIELD_ITEM)`
`505`	`505`	`{`
`@@ -803,7 +803,7 @@ Arg_comparator::can_compare_as_dates(Item a, Item b, ulonglong *const_value)`
`803`	`803`	`confuse storage engines since in context analysis mode tables`
`804`	`804`	`aren't locked.`
`805`	`805`	`*/`
`806`		`- if (!thd->is_context_analysis_only() &&`
	`806`	`+ if (!thd->lex->is_ps_or_view_context_analysis() &&`
`807`	`807`	`cmp_type != CMP_DATE_WITH_DATE && str_arg->const_item() &&`
`808`	`808`	`(str_arg->type() != Item::FUNC_ITEM \|\|`
`809`	`809`	`((Item_func*)str_arg)->functype() != Item_func::GUSERVAR_FUNC))`
`@@ -1036,7 +1036,7 @@ Item** Arg_comparator::cache_converted_constant(THD thd_arg, Item *value,`
`1036`	`1036`	`Item_result type)`
`1037`	`1037`	`{`
`1038`	`1038`	`/* Don't need cache if doing context analysis only. */`
`1039`		`- if (!thd_arg->is_context_analysis_only() &&`
	`1039`	`+ if (!thd->lex->is_ps_or_view_context_analysis() &&`
`1040`	`1040`	`(value)->const_item() && type != (value)->result_type())`
`1041`	`1041`	`{`
`1042`	`1042`	`Item_cache cache= Item_cache::get_cache(value, type);`
`@@ -4714,7 +4714,7 @@ bool Item_func_like::fix_fields(THD thd, Item *ref)`
`4714`	`4714`	`return TRUE;`
`4715`	`4715`	`}`
`4716`	`4716`
`4717`		`- if (escape_item->const_item() && !thd->lex->view_prepare_mode)`
	`4717`	`+ if (escape_item->const_item())`
`4718`	`4718`	`{`
`4719`	`4719`	`/* If we are on execution stage */`
`4720`	`4720`	`String *escape_str= escape_item->val_str(&cmp.value1);`