From c38d9110f7eea0a56f4ff54af91da4ae9d3df77d Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 16 Jun 2003 13:18:57 +0200 Subject: [PATCH 1/3] comment added --- mysys/tree.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mysys/tree.c b/mysys/tree.c index a3b69ebff5e..91d2f9771b5 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -46,6 +46,16 @@ Implemented by monty. */ +/* + NOTE: + tree->compare function should be ALWAYS called as + (*tree->compare)(custom_arg, ELEMENT_KEY(tree,element), key) + and not other way around, as + (*tree->compare)(custom_arg, key, ELEMENT_KEY(tree,element)) + + ft_boolean_search.c (at least) relies on that. +*/ + #include "mysys_priv.h" #include #include From 1aabc50bb5f2fd0448f2156658f406b1a165ba0f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 26 Jun 2003 13:23:08 +0200 Subject: [PATCH 2/3] preload.test: Change mode to -rw-rw-r-- mysql-test/t/preload.test: Change mode to -rw-rw-r-- --- mysql-test/t/preload.test | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 mysql-test/t/preload.test diff --git a/mysql-test/t/preload.test b/mysql-test/t/preload.test old mode 100755 new mode 100644 From 7e4b7fef26496ea07562252f81c7617efeaf86b9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 27 Jun 2003 19:32:59 +0200 Subject: [PATCH 3/3] fix test when no InnoDB is present --- mysql-test/t/func_group.test | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/t/func_group.test b/mysql-test/t/func_group.test index 1bf924100a9..fed19cbe07c 100644 --- a/mysql-test/t/func_group.test +++ b/mysql-test/t/func_group.test @@ -348,7 +348,9 @@ insert into t1 values (3,1); select a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b) from t1 group by a; select SQL_BIG_RESULT a,count(b), sum(b), avg(b), std(b), min(b), max(b), bit_and(b), bit_or(b) from t1 group by a; drop table t1; +--disable_warnings create table t1 (USR_ID integer not null, MAX_REQ integer not null, constraint PK_SEA_USER primary key (USR_ID)) type=InnoDB; +--enable_warnings insert into t1 values (1, 3); select count(*) + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ + MAX_REQ - MAX_REQ from t1 group by MAX_REQ; select Case When Count(*) < MAX_REQ Then 1 Else 0 End from t1 where t1.USR_ID = 1 group by MAX_REQ;