From 1bdc226e6658c9fb21727f043149c2873ba6dd78 Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Fri, 26 Apr 2002 08:56:28 +0300
Subject: Portability fixes

myisam/ft_boolean_search.c:
  Portability fix
mysql-test/mysql-test-run.sh:
  Added slave_net_timeout
mysql-test/r/func_if.result:
  Updated results after merge from 3.23
mysql-test/r/func_test.result:
  Updated results after merge from 3.23
mysql-test/r/innodb.result:
  Updated results after merge from 3.23
mysql-test/r/show_check.result:
  Updated results after merge from 3.23
mysql-test/r/variables.result:
  Updated results after merge from 3.23
---
 mysql-test/r/func_if.result | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'mysql-test/r/func_if.result')

diff --git a/mysql-test/r/func_if.result b/mysql-test/r/func_if.result
index 64ee8c67def..16fb0358d51 100644
--- a/mysql-test/r/func_if.result
+++ b/mysql-test/r/func_if.result
@@ -1,5 +1,10 @@
+drop table if exists t1;
+select IF(0,"ERROR","this"),IF(1,"is","ERROR"),IF(NULL,"ERROR","a"),IF(1,2,3)|0,IF(1,2.0,3.0)+0 ;
 IF(0,"ERROR","this")	IF(1,"is","ERROR")	IF(NULL,"ERROR","a")	IF(1,2,3)|0	IF(1,2.0,3.0)+0
 this	is	a	2	2.0
+CREATE TABLE t1 (st varchar(255) NOT NULL, u int(11) NOT NULL) TYPE=MyISAM;
+INSERT INTO t1 VALUES ('a',1),('A',1),('aa',1),('AA',1),('a',1),('aaa',0),('BBB',0);
+select if(1,st,st) s from t1 order by s;
 s
 a
 A
@@ -8,6 +13,7 @@ aa
 AA
 aaa
 BBB
+select if(u=1,st,st) s from t1 order by s;
 s
 a
 A
@@ -16,6 +22,7 @@ aa
 AA
 aaa
 BBB
+select if(u=1,binary st,st) s from t1 order by s;
 s
 A
 AA
@@ -24,6 +31,7 @@ a
 a
 aa
 aaa
+select if(u=1,st,binary st) s from t1 where st like "%a%" order by s;
 s
 A
 AA
@@ -31,5 +39,10 @@ a
 a
 aa
 aaa
+drop table t1;
+create table t1 (num  double(12,2));
+insert into t1 values (144.54);
+select sum(if(num is null,0.00,num)) from t1;
 sum(if(num is null,0.00,num))
-nan
+144.54
+drop table t1;
-- 
cgit v1.2.1