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

Removing the "thd" argument from Item::create_field_for_create_select().

Browse Source 
"thd" is available through the "table" argument, as table->in_use.
This commit is contained in:
Alexander Barkov
2016-07-01 21:45:57 +04:00
parent ffac85482b
commit 675d8a94f5
7 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item.h
View File

@@ -1056,7 +1056,7 @@ public:
int save_str_value_in_field(Field *field, String *result); int save_str_value_in_field(Field *field, String *result);
virtual Field *get_tmp_table_field() { return 0; } virtual Field *get_tmp_table_field() { return 0; }
virtual Field *create_field_for_create_select(THD *thd, TABLE *table); virtual Field *create_field_for_create_select(TABLE *table);
virtual Field *create_field_for_schema(THD *thd, TABLE *table); virtual Field *create_field_for_schema(THD *thd, TABLE *table);
virtual const char *full_name() const { return name ? name : "???"; } virtual const char *full_name() const { return name ? name : "???"; }
const char *field_name_or_null() const char *field_name_or_null()

2
sql/item_cmpfunc.h
View File

@@ -951,7 +951,7 @@ public:
maybe_null= args[1]->maybe_null; maybe_null= args[1]->maybe_null;
} }
const char *func_name() const { return "ifnull"; } const char *func_name() const { return "ifnull"; }
Field *create_field_for_create_select(THD *thd, TABLE *table) Field *create_field_for_create_select(TABLE *table)
{ return tmp_table_field_from_field_type(table, false, false); } { return tmp_table_field_from_field_type(table, false, false); }
table_map not_null_tables() const { return 0; } table_map not_null_tables() const { return 0; }

7
sql/item_func.h
View File

@@ -173,9 +173,8 @@ public:
} }
void signal_divide_by_null(); void signal_divide_by_null();
friend class udf_handler; friend class udf_handler;
Field *create_field_for_create_select(THD *thd, TABLE *table) Field *create_field_for_create_select(TABLE *table)
{ {
DBUG_ASSERT(thd == table->in_use);
return result_type() != STRING_RESULT ? return result_type() != STRING_RESULT ?
create_tmp_field(false, table, MY_INT32_NUM_DECIMAL_DIGITS) : create_tmp_field(false, table, MY_INT32_NUM_DECIMAL_DIGITS) :
tmp_table_field_from_field_type(table, false, false); tmp_table_field_from_field_type(table, false, false);
@@ -1789,7 +1788,7 @@ public:
bool update(); bool update();
bool fix_fields(THD *thd, Item **ref); bool fix_fields(THD *thd, Item **ref);
void fix_length_and_dec(); void fix_length_and_dec();
Field *create_field_for_create_select(THD *thd, TABLE *table) Field *create_field_for_create_select(TABLE *table)
{ {
return result_type() != STRING_RESULT ? return result_type() != STRING_RESULT ?
create_tmp_field(false, table, MY_INT32_NUM_DECIMAL_DIGITS) : create_tmp_field(false, table, MY_INT32_NUM_DECIMAL_DIGITS) :
@@ -2158,7 +2157,7 @@ public:
enum enum_field_types field_type() const; enum enum_field_types field_type() const;
Field *create_field_for_create_select(THD *thd, TABLE *table) Field *create_field_for_create_select(TABLE *table)
{ {
return result_type() != STRING_RESULT ? return result_type() != STRING_RESULT ?
sp_result_field : sp_result_field :

2
sql/item_geofunc.cc
View File

@@ -40,7 +40,7 @@
#include "opt_range.h" #include "opt_range.h"
Field *Item_geometry_func::create_field_for_create_select(THD *thd, TABLE *t_arg) Field *Item_geometry_func::create_field_for_create_select(TABLE *t_arg)
{ {
Field *result; Field *result;
if ((result= new Field_geom(max_length, maybe_null, name, t_arg->s, if ((result= new Field_geom(max_length, maybe_null, name, t_arg->s,

2
sql/item_geofunc.h
View File

@@ -40,7 +40,7 @@ public:
Item_geometry_func(THD *thd, List<Item> &list): Item_str_func(thd, list) {} Item_geometry_func(THD *thd, List<Item> &list): Item_str_func(thd, list) {}
void fix_length_and_dec(); void fix_length_and_dec();
enum_field_types field_type() const { return MYSQL_TYPE_GEOMETRY; } enum_field_types field_type() const { return MYSQL_TYPE_GEOMETRY; }
Field *create_field_for_create_select(THD *thd, TABLE *table); Field *create_field_for_create_select(TABLE *table);
}; };
class Item_func_geometry_from_text: public Item_geometry_func class Item_func_geometry_from_text: public Item_geometry_func

2
sql/item_timefunc.h
View File

@@ -506,7 +506,7 @@ public:
bool get_date(MYSQL_TIME *res, ulonglong fuzzy_date) { DBUG_ASSERT(0); return 1; } bool get_date(MYSQL_TIME *res, ulonglong fuzzy_date) { DBUG_ASSERT(0); return 1; }
my_decimal *val_decimal(my_decimal *decimal_value) my_decimal *val_decimal(my_decimal *decimal_value)
{ return val_decimal_from_date(decimal_value); } { return val_decimal_from_date(decimal_value); }
Field *create_field_for_create_select(THD *thd, TABLE *table) Field *create_field_for_create_select(TABLE *table)
{ return tmp_table_field_from_field_type(table, false, false); } { return tmp_table_field_from_field_type(table, false, false); }
int save_in_field(Field *field, bool no_conversions) int save_in_field(Field *field, bool no_conversions)
{ return save_date_in_field(field); } { return save_date_in_field(field); }

6
sql/sql_insert.cc
View File

@@ -3934,10 +3934,10 @@ void select_insert::abort_result_set() {
CREATE TABLE (SELECT) ... CREATE TABLE (SELECT) ...
***************************************************************************/ ***************************************************************************/
Field *Item::create_field_for_create_select(THD *thd, TABLE *table) Field *Item::create_field_for_create_select(TABLE *table)
{ {
Field *def_field, *tmp_field; Field *def_field, *tmp_field;
return ::create_tmp_field(thd, table, this, type(), return ::create_tmp_field(table->in_use, table, this, type(),
(Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0); (Item ***) 0, &tmp_field, &def_field, 0, 0, 0, 0);
} }
@@ -4012,7 +4012,7 @@ static TABLE *create_table_from_items(THD *thd,
while ((item=it++)) while ((item=it++))
{ {
Field *tmp_field= item->create_field_for_create_select(thd, &tmp_table); Field *tmp_field= item->create_field_for_create_select(&tmp_table);
if (!tmp_field) if (!tmp_field)
DBUG_RETURN(NULL); DBUG_RETURN(NULL);