Commit 67202bad authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
parents 8a384d3c 73238e55

mysql-test/r/distinct.result

+21 −0
Original line number Diff line number Diff line
@@ -512,3 +512,24 @@ id IFNULL(dsc, '-') 
2	line number two

3	line number three

drop table t1;

CREATE TABLE t1 (

ID int(11) NOT NULL auto_increment,

x varchar(20) default NULL,

y decimal(10,0) default NULL,

PRIMARY KEY  (ID),

KEY (y)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO t1 VALUES

(1,'ba','-1'),

(2,'ba','1150'),

(306,'ba','-1'),

(307,'ba','1150'),

(611,'ba','-1'),

(612,'ba','1150');

select count(distinct x,y) from t1;

count(distinct x,y)

2

select count(distinct concat(x,y)) from t1;

count(distinct concat(x,y))

2

drop table t1;

mysql-test/r/ndb_lock.result

+11 −0
Original line number Diff line number Diff line
@@ -63,3 +63,14 @@ pk u o 
5	5	5

insert into t1 values (1,1,1);

drop table t1;

create table t3 (id2 int) engine=ndb;

lock tables t3 write;

unlock tables;

drop table t3;

create table t2 (id int, j int) engine=ndb;

insert into t2 values (2, 2);

create table t3 (id int) engine=ndb;

lock tables t3 read;

delete t2 from t2, t3 where t2.id = t3.id;

unlock tables;

drop table t2, t3;

mysql-test/r/rpl_trunc_temp.result

0 → 100644
+22 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create temporary table t1 (n int);

insert into t1 values(1);

show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	1

delete from t1;

show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	1

truncate t1;

show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	1

show status like 'Slave_open_temp_tables';

Variable_name	Value

Slave_open_temp_tables	0

mysql-test/r/xml.result

+36 −0
Original line number Diff line number Diff line
@@ -561,6 +561,42 @@ A B C 
select extractvalue('<A_B>A</A_B>','/A_B');

extractvalue('<A_B>A</A_B>','/A_B')

A

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[position()]')

B1 B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=last()]')

B1 B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()]')

B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()-1]')

B1

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=1]')



select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=2]')

B1 B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[last()=position()]')

B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)]')

B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)-1]')

B1

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=1]')



select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=2]')

B1 B2

select extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]');

extractvalue('<a>A<b>B1</b><b>B2</b></a>','/a/b[count(.)=position()]')

B2

select extractvalue('<a>Jack</a>','/a[contains(../a,"J")]');

extractvalue('<a>Jack</a>','/a[contains(../a,"J")]')

Jack

mysql-test/t/distinct.test

+24 −0
Original line number Diff line number Diff line
@@ -358,3 +358,27 @@ select distinct id, IFNULL(dsc, '-') from t1; 
drop table t1;



# End of 4.1 tests





#

# Bug #15745 ( COUNT(DISTINCT CONCAT(x,y)) returns wrong result)

#

CREATE TABLE t1 (

  ID int(11) NOT NULL auto_increment,

  x varchar(20) default NULL,

  y decimal(10,0) default NULL,

  PRIMARY KEY  (ID),

  KEY (y)

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



INSERT INTO t1 VALUES

(1,'ba','-1'),

(2,'ba','1150'),

(306,'ba','-1'),

(307,'ba','1150'),

(611,'ba','-1'),

(612,'ba','1150');



select count(distinct x,y) from t1;

select count(distinct concat(x,y)) from t1;

drop table t1;