diff options
| author | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-26 19:30:57 +0300 |
| commit | a6fd899427f24837c293d871ee0b53e7167b84cf (patch) | |
| tree | ceda3ef9437fa5cd2e14de6aebba351d121354c2 /sql/field.cc | |
| parent | 5ca935d8d47e546c938de089e35cb2b49531e150 (diff) | |
| parent | 8255e5a367b588f73a0e7c6dcfbdac22a2cc7103 (diff) | |
| download | mariadb-git-a6fd899427f24837c293d871ee0b53e7167b84cf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/field.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 71cc2ce3e74..7a184ce4f73 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3508,8 +3508,8 @@ bool Field_time::send_binary(Protocol *protocol) { TIME tm; Field_time::get_time(&tm); - tm.day= tm.hour/3600; // Move hours to days - tm.hour-= tm.day*3600; + tm.day= tm.hour/24; // Move hours to days + tm.hour-= tm.day*24; return protocol->store_time(&tm); } |