summaryrefslogtreecommitdiff
path: root/sql/set_var.h
diff options
context:
space:
mode:
authorkonstantin@mysql.com <>2004-06-24 19:08:36 +0400
committerkonstantin@mysql.com <>2004-06-24 19:08:36 +0400
commita30fcdc690955b883376fe56c099c97c944ab7c8 (patch)
tree51efbaacdacd9dad5c2745e3ccb58a3614f4f608 /sql/set_var.h
parent3bcbdcb4061bbdf264c8b7d2ddd0cb7fb47fb8b4 (diff)
downloadmariadb-git-a30fcdc690955b883376fe56c099c97c944ab7c8.tar.gz
Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes: - str_to_TIME renamed to str_to_datetime to pair with str_to_time - functions str_to_time and str_to_TIME moved to sql-common - send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE, MYSQL_TIME_DATETIME types of user input buffers. - few more comments in the client library - a test case added.
Diffstat (limited to 'sql/set_var.h')
-rw-r--r--sql/set_var.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.h b/sql/set_var.h
index c2b4ca34b2d..a51e44285d6 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -669,7 +669,7 @@ public:
class sys_var_thd_date_time_format :public sys_var_thd
{
DATE_TIME_FORMAT *SV::*offset;
- enum timestamp_type date_time_type;
+ timestamp_type date_time_type;
public:
sys_var_thd_date_time_format(const char *name_arg,
DATE_TIME_FORMAT *SV::*offset_arg,