Commit 3b6263b8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/elkin/MySQL/BARE/5.0 

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
sql/sql_base.cc:
  manual merge use local. Another changeset for 5.1 is following.
parents 1e869b0e d00a6cf4

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -3580,7 +3580,7 @@ sub valgrind_arguments { 


  if ( $opt_valgrind_options )

  {

    mtr_add_arg($args, split(' ', $opt_valgrind_options));

    mtr_add_arg($args, '%s', $_) for (split(' ', $opt_valgrind_options));

  }

mysql-test/r/case.result

+8 −0
Original line number Diff line number Diff line
@@ -175,6 +175,14 @@ SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END; 
case+union+test

case+union+test

nobug

create table t1(a float, b int default 3);

insert into t1 (a) values (2), (11), (8);

select min(a), min(case when 1=1 then a else NULL end),

min(case when 1!=1 then NULL else a end) 

from t1 where b=3 group by b;

min(a)	min(case when 1=1 then a else NULL end)	min(case when 1!=1 then NULL else a end)

2	2	2

drop table t1;

CREATE TABLE t1 (EMPNUM INT);

INSERT INTO t1 VALUES (0), (2);

CREATE TABLE t2 (EMPNUM DECIMAL (4, 2));

mysql-test/r/func_compress.result

+7 −0
Original line number Diff line number Diff line
@@ -72,3 +72,10 @@ set @@max_allowed_packet=1048576*100; 
select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;

compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null

0

create table t1(a blob);

insert into t1 values(NULL), (compress('a'));

select uncompress(a), uncompressed_length(a) from t1;

uncompress(a)	uncompressed_length(a)

NULL	NULL

a	1

drop table t1;

mysql-test/r/rpl_temporary.result

+14 −0
Original line number Diff line number Diff line
@@ -88,3 +88,17 @@ f 
1

drop temporary table t4;

drop table t5;

set @session.pseudo_thread_id=100;

create temporary table t101 (id int);

create temporary table t102 (id int);

set @session.pseudo_thread_id=200;

create temporary table t201 (id int);

create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);

set @con1_id=connection_id();

kill @con1_id;

create table t1(f int);

insert into t1 values (1);

select * from t1 /* must be 1 */;

f

1

drop table t1;

mysql-test/t/case.test

+11 −0
Original line number Diff line number Diff line
@@ -122,6 +122,17 @@ SELECT 'case+union+test' 
UNION 

SELECT CASE '1' WHEN '2' THEN 'BUG' ELSE 'nobug' END;



#

# Bug #17896: problem with MIN(CASE...)

#



create table t1(a float, b int default 3);

insert into t1 (a) values (2), (11), (8);

select min(a), min(case when 1=1 then a else NULL end),

  min(case when 1!=1 then NULL else a end) 

from t1 where b=3 group by b;

drop table t1;



# End of 4.1 tests