From a74154f4de0b4f3765eb06932fb9ec3e79f764e0 Mon Sep 17 00:00:00 2001
From: unknown <igor@rurik.mysql.com>
Date: Fri, 9 Jun 2006 19:29:39 -0700
Subject: [PATCH] Post-merge fixes

---
 mysql-test/r/sysdate_is_now.result | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/r/sysdate_is_now.result b/mysql-test/r/sysdate_is_now.result
index 82861436ff6..1ebbb8c1588 100644
--- a/mysql-test/r/sysdate_is_now.result
+++ b/mysql-test/r/sysdate_is_now.result
@@ -1,4 +1,4 @@
 set timestamp=1;
 SELECT sleep(1),NOW()-SYSDATE() as zero;
 sleep(1)	zero
-0	0
+0	0.000000