changed name of bit on more descriptive (after rewie change)

sql/item_create.cc

@@ -159,7 +159,7 @@ Item *create_func_from_days(Item* a)
 
 Item *create_func_get_lock(Item* a, Item *b)
 {
-  current_thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new Item_func_get_lock(a, b);
 }
 
@@ -324,7 +324,7 @@ Item *create_func_radians(Item *a)
 
 Item *create_func_release_lock(Item* a)
 {
-  current_thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new Item_func_release_lock(a);
 }
 
@@ -445,7 +445,7 @@ Item *create_func_year(Item* a)
 
 Item *create_load_file(Item* a)
 {
-  current_thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new Item_load_file(a);
 }
 
@@ -472,13 +472,13 @@ Item *create_func_cast(Item *a, Cast_target cast_type, int len,
 
 Item *create_func_is_free_lock(Item* a)
 {
-  current_thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new Item_func_is_free_lock(a);
 }
 
 Item *create_func_is_used_lock(Item* a)
 {
-  current_thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  current_thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   return new Item_func_is_used_lock(a);
 }
 

sql/item_func.cc

@@ -2950,7 +2950,7 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name,
   }
   if (!(item=var->item(thd, var_type, component_name)))
     return 0;					// Impossible
-  thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   buff[0]='@';
   buff[1]='@';
   pos=buff+2;
@@ -2990,7 +2990,7 @@ Item *get_system_var(THD *thd, enum_var_type var_type, const char *var_name,
   DBUG_ASSERT(var != 0);
   if (!(item=var->item(thd, var_type, &null_lex_string)))
     return 0;						// Impossible
-  thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE);
+  thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
   item->set_name(item_name, 0, system_charset_info);	// Will use original name
   return item;
 }

sql/mysql_priv.h

@@ -251,7 +251,7 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
 // uncachable cause
 #define UNCACHEABLE_DEPENDENT   1
 #define UNCACHEABLE_RAND        2
-#define UNCACHEABLE_UNCACHEABLE 4
+#define UNCACHEABLE_SIDEEFFECT 4
 
 #ifdef EXTRA_DEBUG
 /*

sql/sql_lex.h

@@ -231,7 +231,7 @@ public:
     result of this query can't be cached, bit field, can be :
       UNCACHEABLE_DEPENDENT
       UNCACHEABLE_RAND
-      UNCACHEABLE_UNCACHEABLE
+      UNCACHEABLE_SIDEEFFECT
   */
   uint8 uncacheable;
   enum sub_select_type linkage;

sql/sql_yacc.yy

@@ -2893,7 +2893,7 @@ simple_expr:
 	| BENCHMARK_SYM '(' ULONG_NUM ',' expr ')'
 	  {
 	    $$=new Item_func_benchmark($3,$5);
-	    Lex->uncacheable(UNCACHEABLE_UNCACHEABLE);
+	    Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
 	  }
 	| EXTRACT_SYM '(' interval FROM expr ')'
 	{ $$=new Item_extract( $3, $5); };
@@ -3473,7 +3473,7 @@ procedure_clause:
 	    lex->proc_list.next= (byte**) &lex->proc_list.first;
 	    if (add_proc_to_list(lex->thd, new Item_field(NULL,NULL,$2.str)))
 	      YYABORT;
-	    Lex->uncacheable(UNCACHEABLE_UNCACHEABLE);
+	    Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
 	  }
 	  '(' procedure_list ')';
 
@@ -3527,7 +3527,7 @@ into:
 	  LEX *lex=Lex;
 	  if (!lex->describe)
 	  {
-	    lex->uncacheable(UNCACHEABLE_UNCACHEABLE);
+	    lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
 	    if (!(lex->exchange= new sql_exchange($3.str,0)))
 	      YYABORT;
 	    if (!(lex->result= new select_export(lex->exchange)))
@@ -3540,7 +3540,7 @@ into:
 	  LEX *lex=Lex;
 	  if (!lex->describe)
 	  {
-	    lex->uncacheable(UNCACHEABLE_UNCACHEABLE);
+	    lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
 	    if (!(lex->exchange= new sql_exchange($3.str,1)))
 	      YYABORT;
 	    if (!(lex->result= new select_dump(lex->exchange)))
@@ -3549,7 +3549,7 @@ into:
 	}
         | INTO select_var_list_init
 	{
-	  Lex->uncacheable(UNCACHEABLE_UNCACHEABLE);
+	  Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
 	}
         ;