diff options
| author | cmiller@zippy.cornsilk.net <> | 2007-06-14 18:17:26 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2007-06-14 18:17:26 -0400 |
| commit | 85caa3540e6e42242ffb9336788f1d3d00127075 (patch) | |
| tree | 72e7c1a8261bde33ec6c4ca60f1474482de94771 /sql/protocol.cc | |
| parent | d37e579411b446ff184cf8af239faf636ff85050 (diff) | |
| parent | c67c49fff0fc58199416177fb69fd166b726e93a (diff) | |
| download | mariadb-git-85caa3540e6e42242ffb9336788f1d3d00127075.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index f9ba734a48d..ced6d78519a 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -948,7 +948,7 @@ bool Protocol_simple::store(Field *field) */ -bool Protocol_simple::store(TIME *tm) +bool Protocol_simple::store(MYSQL_TIME *tm) { #ifndef DBUG_OFF DBUG_ASSERT(field_types == 0 || @@ -971,7 +971,7 @@ bool Protocol_simple::store(TIME *tm) } -bool Protocol_simple::store_date(TIME *tm) +bool Protocol_simple::store_date(MYSQL_TIME *tm) { #ifndef DBUG_OFF DBUG_ASSERT(field_types == 0 || @@ -990,7 +990,7 @@ bool Protocol_simple::store_date(TIME *tm) we support 0-6 decimals for time. */ -bool Protocol_simple::store_time(TIME *tm) +bool Protocol_simple::store_time(MYSQL_TIME *tm) { #ifndef DBUG_OFF DBUG_ASSERT(field_types == 0 || @@ -1162,7 +1162,7 @@ bool Protocol_prep::store(Field *field) } -bool Protocol_prep::store(TIME *tm) +bool Protocol_prep::store(MYSQL_TIME *tm) { char buff[12],*pos; uint length; @@ -1188,7 +1188,7 @@ bool Protocol_prep::store(TIME *tm) return packet->append(buff, length+1, PACKET_BUFFER_EXTRA_ALLOC); } -bool Protocol_prep::store_date(TIME *tm) +bool Protocol_prep::store_date(MYSQL_TIME *tm) { tm->hour= tm->minute= tm->second=0; tm->second_part= 0; @@ -1196,7 +1196,7 @@ bool Protocol_prep::store_date(TIME *tm) } -bool Protocol_prep::store_time(TIME *tm) +bool Protocol_prep::store_time(MYSQL_TIME *tm) { char buff[13], *pos; uint length; |