summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-27 19:22:09 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-30 11:43:02 +0200
commit0a056c9b5302c24ee4eaa9cc92bd6697125f94b7 (patch)
tree30576f580f31b6564d26340c61f36d8e350955de /sql/item_timefunc.h
parent1b4f0962c14b3c827553e2a470c82afc419f9352 (diff)
downloadmariadb-git-0a056c9b5302c24ee4eaa9cc92bd6697125f94b7.tar.gz
better ER_VIRTUAL_COLUMN_FUNCTION_IS_NOT_ALLOWED
Diffstat (limited to 'sql/item_timefunc.h')
-rw-r--r--sql/item_timefunc.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h
index e5040d51b72..9f67a1dabe6 100644
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
@@ -196,7 +196,7 @@ public:
}
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg, VCOL_IMPOSSIBLE);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_IMPOSSIBLE);
}
};
@@ -411,7 +411,7 @@ class Item_func_dayname :public Item_func_weekday
bool check_partition_func_processor(void *int_arg) {return TRUE;}
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg, VCOL_IMPOSSIBLE);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_IMPOSSIBLE);
}
};
@@ -464,7 +464,7 @@ public:
{
if (arg_count)
return FALSE;
- return mark_unsupported_function(func_name(), arg, VCOL_TIME_FUNC);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_TIME_FUNC);
}
longlong int_op();
my_decimal *decimal_op(my_decimal* buf);
@@ -614,7 +614,7 @@ public:
virtual void store_now_in_TIME(THD *thd, MYSQL_TIME *now_time)=0;
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg, VCOL_TIME_FUNC);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_TIME_FUNC);
}
};
@@ -649,7 +649,7 @@ public:
virtual void store_now_in_TIME(THD *thd, MYSQL_TIME *now_time)=0;
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg,
+ return mark_unsupported_function(func_name(), "()", arg,
VCOL_TIME_FUNC);
}
};
@@ -691,7 +691,7 @@ public:
NOW is safe for replication as slaves will run with same time as
master
*/
- return mark_unsupported_function(func_name(), arg, VCOL_TIME_FUNC);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_TIME_FUNC);
}
};
@@ -715,7 +715,7 @@ public:
virtual enum Functype functype() const { return NOW_UTC_FUNC; }
virtual bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg,
+ return mark_unsupported_function(func_name(), "()", arg,
VCOL_TIME_FUNC | VCOL_NON_DETERMINISTIC);
}
@@ -737,7 +737,7 @@ public:
table_map used_tables() const { return RAND_TABLE_BIT; }
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg,
+ return mark_unsupported_function(func_name(), "()", arg,
VCOL_TIME_FUNC | VCOL_NON_DETERMINISTIC);
}
virtual enum Functype functype() const { return SYSDATE_FUNC; }
@@ -776,7 +776,7 @@ public:
bool eq(const Item *item, bool binary_cmp) const;
bool check_vcol_func_processor(void *arg)
{
- return mark_unsupported_function(func_name(), arg, VCOL_IMPOSSIBLE);
+ return mark_unsupported_function(func_name(), "()", arg, VCOL_IMPOSSIBLE);
}
};