summaryrefslogtreecommitdiff
path: root/sql/item_create.cc
diff options
context:
space:
mode:
authorunknown <aivanov@mysql.com>2005-09-14 20:25:00 +0400
committerunknown <aivanov@mysql.com>2005-09-14 20:25:00 +0400
commitb214671e0953e0fb11d2d8737f053320f6b21327 (patch)
treea96961d0d3883524dcd53ca0300556dc7d1de536 /sql/item_create.cc
parent0b318fd64f1da2c658f90073f12e7349e3e4bac4 (diff)
downloadmariadb-git-b214671e0953e0fb11d2d8737f053320f6b21327.tar.gz
Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
DAYOFWEEK(), and WEEKDAY(). mysql-test/r/func_time.result: Fixed new results for testcases containing EXPLAIN EXTENDED SELECT ... WEEKDAY ... DAYNAME. The new results are correct and correspond to the changes in create_func_weekday() and create_func_dayname(). mysql-test/r/view.result: Fixed some testcases results (bugs #12963, #13000). mysql-test/t/view.test: Added testcases for for bugs #12963, #13000. sql/item_create.cc: Fixed bugs #12963, #13000: wrong VIEW creation with DAYNAME(), DAYOFWEEK(), and WEEKDAY(). Modified create_func_dayname(), create_func_dayofweek(), and create_func_weekday(). They donĀ“t insert Item_func_to_days object now. sql/item_timefunc.cc: Fixed bugs #12963, #13000: wrong VIEW creation with DAYNAME(), DAYOFWEEK(), and WEEKDAY(). Modified Item_func_weekday::val_int(). The argument of weekday should not be considered now to be Item_func_to_days object. sql/item_timefunc.h: Fixed bugs #12963, 13000: wrong VIEW creation with DAYNAME(), DAYOFWEEK(), and WEEKDAY. Modified Item_func_weekday::func_name(). It returns now different names depending on the odbc_type attribute value.
Diffstat (limited to 'sql/item_create.cc')
-rw-r--r--sql/item_create.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc
index 82a82873ad9..342ef245a76 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -109,7 +109,7 @@ Item *create_func_dayofmonth(Item* a)
Item *create_func_dayofweek(Item* a)
{
- return new Item_func_weekday(new Item_func_to_days(a),1);
+ return new Item_func_weekday(a, 1);
}
Item *create_func_dayofyear(Item* a)
@@ -119,7 +119,7 @@ Item *create_func_dayofyear(Item* a)
Item *create_func_dayname(Item* a)
{
- return new Item_func_dayname(new Item_func_to_days(a));
+ return new Item_func_dayname(a);
}
Item *create_func_degrees(Item *a)
@@ -443,7 +443,7 @@ Item *create_func_version(void)
Item *create_func_weekday(Item* a)
{
- return new Item_func_weekday(new Item_func_to_days(a),0);
+ return new Item_func_weekday(a, 0);
}
Item *create_func_year(Item* a)