diff options
| author | konstantin@mysql.com <> | 2004-06-24 19:08:36 +0400 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2004-06-24 19:08:36 +0400 |
| commit | a30fcdc690955b883376fe56c099c97c944ab7c8 (patch) | |
| tree | 51efbaacdacd9dad5c2745e3ccb58a3614f4f608 /sql/tztime.cc | |
| parent | 3bcbdcb4061bbdf264c8b7d2ddd0cb7fb47fb8b4 (diff) | |
| download | mariadb-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/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 0b0ae2839df..a62720f2eeb 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -584,7 +584,7 @@ sec_to_TIME(TIME * tmp, my_time_t t, long offset) /* filling MySQL specific TIME members */ tmp->neg= 0; tmp->second_part= 0; - tmp->time_type= TIMESTAMP_DATETIME; + tmp->time_type= MYSQL_TIMESTAMP_DATETIME; } @@ -1011,7 +1011,7 @@ Time_zone_system::gmt_sec_to_TIME(TIME *tmp, my_time_t t) const localtime_r(&tmp_t, &tmp_tm); localtime_to_TIME(tmp, &tmp_tm); - tmp->time_type= TIMESTAMP_DATETIME; + tmp->time_type= MYSQL_TIMESTAMP_DATETIME; } @@ -1094,7 +1094,7 @@ Time_zone_utc::gmt_sec_to_TIME(TIME *tmp, my_time_t t) const time_t tmp_t= (time_t)t; gmtime_r(&tmp_t, &tmp_tm); localtime_to_TIME(tmp, &tmp_tm); - tmp->time_type= TIMESTAMP_DATETIME; + tmp->time_type= MYSQL_TIMESTAMP_DATETIME; } |