summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorunknown <bar@bar.mysql.r18.ru>2002-10-30 17:09:37 +0400
committerunknown <bar@bar.mysql.r18.ru>2002-10-30 17:09:37 +0400
commitfdff4a99836b54c5ec17683d1d38f981f87c03c2 (patch)
treed42496394ec3c44e78f9d404c7911e6c52454a29 /sql/item_timefunc.h
parent85f35cbf574eac4bbc0f5dda0416da33da086cd0 (diff)
downloadmariadb-git-fdff4a99836b54c5ec17683d1d38f981f87c03c2.tar.gz
date and time fields now have charset arg in constructor
my_charset_latin1 include/m_ctype.h: my_charset_latin1 is now visible all around the program sql/field.cc: date and time fields now have charset arg in constructor sql/field.h: date and time fields now have charset arg in constructor sql/item_timefunc.h: date and time fields now have charset arg in constructor strings/ctype.c: my_charset_latin1 is now visible all around the program
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index 66c9a1a4438..fab8ea9fa9c 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -243,7 +243,7 @@ public:
}
Field *tmp_table_field(TABLE *t_arg)
{
- return (!t_arg) ? result_field : new Field_date(maybe_null, name, t_arg);
+ return (!t_arg) ? result_field : new Field_date(maybe_null, name, t_arg, my_thd_charset);
}
};
@@ -261,7 +261,7 @@ public:
Field *tmp_table_field(TABLE *t_arg)
{
return (!t_arg) ? result_field : new Field_datetime(maybe_null, name,
- t_arg);
+ t_arg, my_thd_charset);
}
};
@@ -287,7 +287,8 @@ public:
}
Field *tmp_table_field(TABLE *t_arg)
{
- return (!t_arg) ? result_field : new Field_time(maybe_null, name, t_arg);
+ return (!t_arg) ? result_field :
+ new Field_time(maybe_null, name, t_arg, my_thd_charset);
}
};
@@ -379,7 +380,8 @@ public:
}
Field *tmp_table_field(TABLE *t_arg)
{
- return (!t_arg) ? result_field : new Field_time(maybe_null, name, t_arg);
+ return (!t_arg) ? result_field :
+ new Field_time(maybe_null, name, t_arg, my_thd_charset);
}
};
@@ -443,7 +445,8 @@ public:
}
Field *tmp_table_field(TABLE *t_arg)
{
- return (!t_arg) ? result_field : new Field_date(maybe_null, name, t_arg);
+ return (!t_arg) ? result_field :
+ new Field_date(maybe_null, name, t_arg, my_thd_charset);
}
};
@@ -458,7 +461,8 @@ public:
}
Field *tmp_table_field(TABLE *t_arg)
{
- return (!t_arg) ? result_field : new Field_time(maybe_null, name, t_arg);
+ return (!t_arg) ? result_field :
+ new Field_time(maybe_null, name, t_arg, my_thd_charset);
}
};
@@ -474,6 +478,6 @@ public:
Field *tmp_table_field(TABLE *t_arg)
{
return (!t_arg) ? result_field : new Field_datetime(maybe_null, name,
- t_arg);
+ t_arg, my_thd_charset);
}
};