Post-merge fixes

a74154f4 · unknown · ddd55d43 · a74154f4
Commit a74154f4 authored Jun 09, 2006 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/sysdate_is_now.result mysql-test/r/sysdate_is_now.result +1 -1

No files found.
--- a/mysql-test/r/sysdate_is_now.result
+++ b/mysql-test/r/sysdate_is_now.result
 set timestamp=1;
 SELECT sleep(1),NOW()-SYSDATE() as zero;
 sleep(1)	zero
-0	0
+0	0.000000