Commit 5a9475cd authored by unknown's avatar unknown
Browse files

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

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


sql/sql_base.cc:
  Auto merged
parents 991ad10d a91620ae

mysql-test/README

+11 −2
Original line number Diff line number Diff line
@@ -2,8 +2,17 @@ This directory contains a test suite for mysql daemon. To run 
the currently existing test cases, simply execute ./mysql-test-run in

this directory. It will fire up the newly built mysqld and test it.



If you want to run the test with a running MySQL server use the --external

option to mysql-test-run.

If you want to run a test with a running MySQL server use the --extern

option to mysql-test-run. Please note that in this mode the test suite

expects user to specify test names to run. Otherwise it falls back to the

normal "non-extern" behaviour. The reason is that some tests

could not run with external server. Here is the sample command

to test "alias" and "analyze" tests on external server:



mysql-test-run --extern alias analyze



To match your setup you might also need to provide --socket, --user and

other relevant options.



Note that you do not have to have to do make install, and you could

actually have a co-existing MySQL installation - the tests will not

mysql-test/r/index_merge_innodb.result

+11 −0
Original line number Diff line number Diff line
@@ -123,3 +123,14 @@ key1a = 2 and key1b is null and key3a = 2 and key3b is null; 
count(*)

4

drop table t1,t2;

create table t1 (

id1 int,

id2 date ,

index idx2 (id1,id2),

index idx1 (id2)  

) engine = innodb;

insert into t1 values(1,'20040101'), (2,'20040102');

select * from t1  where id1 = 1  and id2= '20040101';

id1	id2

1	2004-01-01

drop table t1;

mysql-test/r/insert_select.result

+15 −0
Original line number Diff line number Diff line
@@ -634,3 +634,18 @@ ff1 ff2 
1	2

2	1

drop table t1, t2;

create table t1 (a int unique);

create table t2 (a int, b int);

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

insert into t2 values (1,2);

select * from t1;

a

1

2

insert into t1 select t2.a from t2 on duplicate key update a= a + t2.b;

select * from t1;

a

2

3

drop table t1;

drop table t2;

mysql-test/r/insert_update.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

DROP TABLE IF EXISTS t1, t2;

CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B));

INSERT t1 VALUES (1,2,10), (3,4,20);

INSERT t1 VALUES (5,6,30) ON DUPLICATE KEY UPDATE c=c+100;

mysql-test/t/index_merge_innodb.test

+11 −0
Original line number Diff line number Diff line
@@ -120,3 +120,14 @@ select count(*) from t1 where 


drop table t1,t2;



# Test for BUG#8441

create table t1 (

  id1 int,

  id2 date ,

  index idx2 (id1,id2),

  index idx1 (id2)  

) engine = innodb;

insert into t1 values(1,'20040101'), (2,'20040102');

select * from t1  where id1 = 1  and id2= '20040101'; 

drop table t1;