database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
sql/item_create.cc:
  changed name of bit on more descriptive
sql/item_func.cc:
  changed name of bit on more descriptive
sql/mysql_priv.h:
  changed name of bit on more descriptive
sql/sql_lex.h:
  changed name of bit on more descriptive
sql/sql_yacc.yy:
  changed name of bit on more descriptive
This commit is contained in:
unknown
2003-11-18 22:04:01 +02:00
parent 1ea21d7085
commit 0d412844ef
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/item_create.cc
View File

@@ -159,7 +159,7 @@ Item *create_func_from_days(Item* a)
Item *create_func_get_lock(Item* a, Item *b) 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); 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) 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); return new Item_func_release_lock(a);
} }
@@ -445,7 +445,7 @@ Item *create_func_year(Item* a)
Item *create_load_file(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); 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) 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); return new Item_func_is_free_lock(a);
} }
Item *create_func_is_used_lock(Item* 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); return new Item_func_is_used_lock(a);
} }

4
sql/item_func.cc
View File

@@ -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))) if (!(item=var->item(thd, var_type, component_name)))
return 0; // Impossible return 0; // Impossible
thd->lex.uncacheable(UNCACHEABLE_UNCACHEABLE); thd->lex.uncacheable(UNCACHEABLE_SIDEEFFECT);
buff[0]='@'; buff[0]='@';
buff[1]='@'; buff[1]='@';
pos=buff+2; 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); DBUG_ASSERT(var != 0);
if (!(item=var->item(thd, var_type, &null_lex_string))) if (!(item=var->item(thd, var_type, &null_lex_string)))
return 0; // Impossible 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 item->set_name(item_name, 0, system_charset_info); // Will use original name
return item; return item;
} }

2
sql/mysql_priv.h
View File

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

2
sql/sql_lex.h
View File

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

10
sql/sql_yacc.yy
View File

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