Commit 771d861c authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
parents 2b104da9 02ad7581

include/my_global.h

+6 −2
Original line number Diff line number Diff line
@@ -533,8 +533,12 @@ C_MODE_END 
#undef DBUG_OFF

#endif



#if defined(_lint) && !defined(DBUG_OFF)

/* We might be forced to turn debug off, if not turned off already */

#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)

#  define DBUG_OFF

#  ifdef DBUG_ON

#    undef DBUG_ON

#  endif

#endif



#include <my_dbug.h>

mysql-test/r/ctype_gbk.result

+7 −0
Original line number Diff line number Diff line
@@ -247,4 +247,11 @@ t1 CREATE TABLE `t1` ( 
  `c2` text NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=gbk

drop table t1;

CREATE TABLE t1(a MEDIUMTEXT CHARACTER SET gbk,

b MEDIUMTEXT CHARACTER SET big5);

INSERT INTO t1 VALUES

(REPEAT(0x1125,200000), REPEAT(0x1125,200000)), ('', ''), ('', '');

SELECT a FROM t1 GROUP BY 1 LIMIT 1 INTO @nullll;

SELECT b FROM t1 GROUP BY 1 LIMIT 1 INTO @nullll;

DROP TABLES t1;

End of 5.0 tests

mysql-test/r/subselect.result

+7 −0
Original line number Diff line number Diff line
@@ -4374,4 +4374,11 @@ a4 f3 a6 
1	NULL	NULL

2	NULL	NULL

DROP TABLE t1, t2, t3, t4;

create table t1 (a float(5,4) zerofill);

create table t2 (a float(5,4),b float(2,0));

select t1.a from t1 where   

t1.a= (select b from t2 limit 1) and not

t1.a= (select a from t2 limit 1) ;

a

drop table t1, t2;

End of 5.0 tests.

mysql-test/r/subselect3.result

+9 −0
Original line number Diff line number Diff line
@@ -770,4 +770,13 @@ SELECT ROW(1, 2) IN (SELECT t1.a, 2 FROM t2) FROM t1 GROUP BY t1.a; 
ROW(1, 2) IN (SELECT t1.a, 2 FROM t2)

1

DROP TABLE t1, t2;

CREATE TABLE t1 (a INT);

INSERT INTO t1 VALUES (1),(2),(3);

CREATE TABLE t2 SELECT * FROM t1;

SELECT 1 FROM t1 WHERE t1.a NOT IN (SELECT 1 FROM t1, t2 WHERE 0);

1

1

1

1

DROP TABLE t1, t2;

End of 5.0 tests

mysql-test/r/type_decimal.result

+7 −0
Original line number Diff line number Diff line
@@ -946,4 +946,11 @@ SELECT ROUND(20061108085411.000002); 
ROUND(20061108085411.000002)

20061108085411

DROP TABLE t1, t2, t3, t4, t5, t6;

create table t1(`c` decimal(9,2));

insert into t1 values (300),(201.11);

select max(case 1 when 1 then c else null end) from t1 group by c;

max(case 1 when 1 then c else null end)

201.11

300.00

drop table t1;

End of 5.0 tests