Commit 0ca8932d authored by paul@teton.kitebird.com's avatar paul@teton.kitebird.com
Browse files

Merge paul@work.mysql.com:/home/bk/mysql-4.0 

into teton.kitebird.com:/home/paul/mysql-4.0
parents 21255c19 21623bff

Docs/manual.texi

+1 −1
Original line number Diff line number Diff line
@@ -31895,7 +31895,7 @@ those listed in the entry for the @code{DATE_FORMAT()} function: 
@example

mysql> select FROM_UNIXTIME(UNIX_TIMESTAMP(),

                            '%Y %D %M %h:%i:%s %x');

        -> '1997 23rd December 03:43:30 x'

        -> '1997 23rd December 03:43:30 1997'

@end example















@findex SEC_TO_TIME()