[prev in list] [next in list] [prev in thread] [next in thread]
List: mysql-internals
Subject: bk commit into 4.1 tree (1.1594)
From: sanja () mysql ! com
Date: 2003-08-29 13:24:05
[Download RAW message or body]
Below is the list of changes that have just been committed into a local
4.1 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.1594 03/08/29 16:24:03 bell@sanja.is.com.ua +4 -0
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of \
tmp_table_field(TABLE *t_arg)
sql/sql_select.cc
1.247 03/08/29 16:23:40 bell@sanja.is.com.ua +6 -6
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of \
tmp_table_field(TABLE *t_arg)
sql/item_timefunc.h
1.37 03/08/29 16:23:40 bell@sanja.is.com.ua +0 -11
no need redefine tmp_table_field(), it will be inherited
sql/item_sum.cc
1.88 03/08/29 16:23:40 bell@sanja.is.com.ua +4 -4
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of \
tmp_table_field(TABLE *t_arg)
sql/item.h
1.87 03/08/29 16:23:40 bell@sanja.is.com.ua +3 -3
tmp_table_field() renamed to get_tmp_table_field() to avoid redifinition of \
tmp_table_field(TABLE *t_arg)
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: bell
# Host: sanja.is.com.ua
# Root: /home/bell/mysql/bk/work-tmp_field-4.1
--- 1.86/sql/item.h Thu Aug 28 04:20:44 2003
+++ 1.87/sql/item.h Fri Aug 29 16:23:40 2003
@@ -140,7 +140,7 @@
virtual double val()=0;
virtual longlong val_int()=0;
virtual String *val_str(String*)=0;
- virtual Field *tmp_table_field() { return 0; }
+ virtual Field *get_tmp_table_field() { return 0; }
virtual Field *tmp_table_field(TABLE *t_arg) { return 0; }
virtual const char *full_name() const { return name ? name : "???"; }
virtual double val_result() { return val(); }
@@ -267,7 +267,7 @@
{
return field->type();
}
- Field *tmp_table_field() { return result_field; }
+ Field *get_tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg) { return result_field; }
bool get_date(TIME *ltime,bool fuzzydate);
bool get_date_result(TIME *ltime,bool fuzzydate);
@@ -546,7 +546,7 @@
Item(thd, item), result_field(item.result_field)
{}
~Item_result_field() {} /* Required with gcc 2.95 */
- Field *tmp_table_field() { return result_field; }
+ Field *get_tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg) { return result_field; }
table_map used_tables() const { return 1; }
virtual void fix_length_and_dec()=0;
--- 1.87/sql/item_sum.cc Thu Aug 28 03:09:42 2003
+++ 1.88/sql/item_sum.cc Fri Aug 29 16:23:40 2003
@@ -1460,7 +1460,7 @@
for (uint i= 0; i < item->arg_count_field; i++)
{
Item *field_item= item->args[i];
- Field *field= field_item->tmp_table_field();
+ Field *field= field_item->get_tmp_table_field();
if (field)
{
uint offset= field->abs_offset;
@@ -1491,7 +1491,7 @@
{
ORDER *order_item= item->order[i];
Item *item= *order_item->item;
- Field *field= item->tmp_table_field();
+ Field *field= item->get_tmp_table_field();
if (field)
{
uint offset= field->abs_offset;
@@ -1542,7 +1542,7 @@
Item *show_item= group_concat_item->args[i];
if (!show_item->const_item())
{
- Field *f= show_item->tmp_table_field();
+ Field *f= show_item->get_tmp_table_field();
char *sv= f->ptr;
f->ptr= (char *)key + f->abs_offset;
String *res= f->val_str(&tmp,&tmp2);
@@ -1709,7 +1709,7 @@
Item *show_item= args[i];
if (!show_item->const_item())
{
- Field *f= show_item->tmp_table_field();
+ Field *f= show_item->get_tmp_table_field();
if (!f->is_null())
{
record_is_null= FALSE;
--- 1.36/sql/item_timefunc.h Thu Aug 21 12:15:22 2003
+++ 1.37/sql/item_timefunc.h Fri Aug 29 16:23:40 2003
@@ -327,7 +327,6 @@
max_length=10*default_charset()->mbmaxlen;
}
int save_in_field(Field *to, bool no_conversions);
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_date(maybe_null, name, t_arg, default_charset()));
@@ -342,7 +341,6 @@
Item_date_func(Item *a) :Item_str_func(a) {}
Item_date_func(Item *a,Item *b) :Item_str_func(a,b) {}
enum_field_types field_type() const { return MYSQL_TYPE_DATETIME; }
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_datetime(maybe_null, name, t_arg, default_charset()));
@@ -366,7 +364,6 @@
longlong val_int() { return value; }
String *val_str(String *str);
void fix_length_and_dec();
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_time(maybe_null, name, t_arg, default_charset()));
@@ -533,7 +530,6 @@
}
enum_field_types field_type() const { return MYSQL_TYPE_TIME; }
const char *func_name() const { return "sec_to_time"; }
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_time(maybe_null, name, t_arg, default_charset()));
@@ -634,7 +630,6 @@
bool get_date(TIME *ltime, bool fuzzy_date);
const char *func_name() const { return "date"; }
enum_field_types field_type() const { return MYSQL_TYPE_DATE; }
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_date(maybe_null, name, t_arg, default_charset()));
@@ -650,7 +645,6 @@
bool get_time(TIME *ltime);
const char *func_name() const { return "time"; }
enum_field_types field_type() const { return MYSQL_TYPE_TIME; }
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_time(maybe_null, name, t_arg, default_charset()));
@@ -665,7 +659,6 @@
String *val_str(String *str);
const char *func_name() const { return "datetime"; }
enum_field_types field_type() const { return MYSQL_TYPE_DATETIME; }
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_datetime(maybe_null, name, t_arg, default_charset()));
@@ -684,7 +677,6 @@
decimals=0;
max_length=8*MY_CHARSET_BIN_MB_MAXLEN;
}
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_date(maybe_null, name, t_arg, &my_charset_bin));
@@ -711,7 +703,6 @@
Change this when we support
microseconds in TIME/DATETIME
*/
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
if (cached_field_type == MYSQL_TYPE_TIME)
@@ -735,7 +726,6 @@
decimals=0;
max_length=17*MY_CHARSET_BIN_MB_MAXLEN;
}
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_time(maybe_null, name, t_arg, &my_charset_bin));
@@ -755,7 +745,6 @@
decimals=0;
max_length=8*MY_CHARSET_BIN_MB_MAXLEN;
}
- Field *tmp_table_field() { return result_field; }
Field *tmp_table_field(TABLE *t_arg)
{
return (new Field_time(maybe_null, name, t_arg, &my_charset_bin));
--- 1.246/sql/sql_select.cc Thu Aug 28 20:38:06 2003
+++ 1.247/sql/sql_select.cc Fri Aug 29 16:23:40 2003
@@ -4789,7 +4789,7 @@
keyinfo->algorithm= HA_KEY_ALG_UNDEF;
for (; group ; group=group->next,key_part_info++)
{
- Field *field=(*group->item)->tmp_table_field();
+ Field *field=(*group->item)->get_tmp_table_field();
bool maybe_null=(*group->item)->maybe_null;
key_part_info->null_bit=0;
key_part_info->field= field;
@@ -6057,7 +6057,7 @@
Item *item= *group->item;
if (item->maybe_null)
{
- Field *field=item->tmp_table_field();
+ Field *field=item->get_tmp_table_field();
field->ptr[-1]= (byte) (field->is_null() ? 1 : 0);
}
}
@@ -6926,7 +6926,7 @@
Item *item;
while ((item=it++))
{
- if (item->tmp_table_field() && ! item->const_item())
+ if (item->get_tmp_table_field() && ! item->const_item())
field_count++;
}
@@ -7162,7 +7162,7 @@
pos->field= ((Item_field*) (*order->item))->field;
else if (order->item[0]->type() == Item::SUM_FUNC_ITEM &&
!order->item[0]->const_item())
- pos->field= ((Item_sum*) order->item[0])->tmp_table_field();
+ pos->field= ((Item_sum*) order->item[0])->get_tmp_table_field();
else if (order->item[0]->type() == Item::COPY_STR_ITEM)
{ // Blob patch
pos->item= ((Item_copy_string*) (*order->item))->item;
@@ -7759,7 +7759,7 @@
join->group= 1;
for (; group ; group=group->next)
{
- Field *field=(*group->item)->tmp_table_field();
+ Field *field=(*group->item)->get_tmp_table_field();
if (field)
{
if (field->type() == FIELD_TYPE_BLOB)
@@ -8103,7 +8103,7 @@
{
item_field= item->get_tmp_table_item(thd);
}
- else if ((field= item->tmp_table_field()))
+ else if ((field= item->get_tmp_table_field()))
{
if (item->type() == Item::SUM_FUNC_ITEM && field->table->group)
item_field= ((Item_sum*) item)->result_item(field);
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic