diff options
| author | unknown <konstantin@mysql.com> | 2004-06-24 19:09:31 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-06-24 19:09:31 +0400 |
| commit | 8d0f2687779de0354d14c83e093991d811138b42 (patch) | |
| tree | 1c3eec012abfb2a5d98d1db69e459003b89bedd1 /sql/tztime.cc | |
| parent | 73d9c9b129475dec400092badb9c1adec892a4da (diff) | |
| parent | 9dde418895f2d236234b975c4ada88ad624e8ba4 (diff) | |
| download | mariadb-git-8d0f2687779de0354d14c83e093991d811138b42.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
sql/field.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/tztime.cc:
Auto merged
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 e87010b3001..0a5b8df664c 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -582,7 +582,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; } @@ -1009,7 +1009,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; } @@ -1092,7 +1092,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; } |