diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-29 23:53:07 +0100 |
| commit | 49e3024c1a1e950e0fe9fecbccfd13c9728a5b82 (patch) | |
| tree | 2e5fd2ea8d04d6274f3da86ac5b02bed3f38bb8a /sql/my_decimal.cc | |
| parent | cadef27521616ba6caea1556ae053a09e3bde6d8 (diff) | |
| parent | 4b13e338241778aefad46fde158a4cb99db083e1 (diff) | |
| download | mariadb-git-49e3024c1a1e950e0fe9fecbccfd13c9728a5b82.tar.gz | |
Merge 192.168.0.5:mysql/mysql-5.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
client/mysqltest.c:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/my_decimal.cc')
| -rw-r--r-- | sql/my_decimal.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sql/my_decimal.cc b/sql/my_decimal.cc index 89607129026..30a271df064 100644 --- a/sql/my_decimal.cc +++ b/sql/my_decimal.cc @@ -15,6 +15,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "mysql_priv.h" +#include <time.h> + #ifndef MYSQL_CLIENT /* @@ -190,6 +192,23 @@ int str2my_decimal(uint mask, const char *from, uint length, } +my_decimal *date2my_decimal(TIME *ltime, my_decimal *dec) +{ + longlong date; + date = (ltime->year*100L + ltime->month)*100L + ltime->day; + if (ltime->time_type > MYSQL_TIMESTAMP_DATE) + date= ((date*100L + ltime->hour)*100L+ ltime->minute)*100L + ltime->second; + if (int2my_decimal(E_DEC_FATAL_ERROR, date, FALSE, dec)) + return dec; + if (ltime->second_part) + { + dec->buf[(dec->intg-1) / 9 + 1]= ltime->second_part * 1000; + dec->frac= 6; + } + return dec; +} + + #ifndef DBUG_OFF /* routines for debugging print */ |