From e3f0e67b8fbe5c6b020dec8daf0f3622202e8911 Mon Sep 17 00:00:00 2001
From: unknown <cmiller@zippy.cornsilk.net>
Date: Mon, 6 Nov 2006 23:02:40 -0500
Subject: [PATCH] Merge fix.

mysql-test/r/func_test.result:
  Merge fix. (Curse BitMover!)
---
 mysql-test/r/func_test.result | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/r/func_test.result b/mysql-test/r/func_test.result
index f3e618ffb4b..43832bdbccc 100644
--- a/mysql-test/r/func_test.result
+++ b/mysql-test/r/func_test.result
@@ -256,6 +256,7 @@ NULL
 NULL
 select mod(NULL, 2.0)       as 'NULL';
 NULL
+NULL
 create table t1 (a int, b int);
 insert into t1 values (1,2), (2,3), (3,4), (4,5);
 select * from t1 where a not between 1 and 2;