Commit fdffe61f authored by unknown's avatar unknown
Browse files

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents 0e21e511 c9a0e4ad

mysql-test/ndb/basic.result

+3 −2
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ HELP Print help text 
HELP SHOW                              Help for SHOW command

HELP DEBUG                             Help for debug compiled version

SHOW                                   Print information about cluster

START BACKUP                           Start backup

START BACKUP [NOWAIT | WAIT STARTED | WAIT COMPLETED]

                                       Start backup (default WAIT COMPLETED)

ABORT BACKUP <backup id>               Abort backup

SHUTDOWN                               Shutdown all processes in cluster and quit

SHUTDOWN                               Shutdown all processes in cluster

CLUSTERLOG ON [<severity>] ...         Enable Cluster logging

CLUSTERLOG OFF [<severity>] ...        Disable Cluster logging

CLUSTERLOG TOGGLE [<severity>] ...     Toggle severity filter on/off

mysql-test/r/insert_update.result

+62 −0
Original line number Diff line number Diff line
@@ -105,3 +105,65 @@ a b 
8	28

9	29

drop table t1;

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

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

INSERT t1 SELECT 5,6,30 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;

SELECT * FROM t1;

a	b	c

1	2	10

3	4	20

5	6	30

INSERT t1 SELECT 5,7,40 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;

SELECT * FROM t1;

a	b	c

1	2	10

3	4	20

5	6	130

INSERT t1 SELECT 8,4,50 FROM DUAL ON DUPLICATE KEY UPDATE c=c+1000;

SELECT * FROM t1;

a	b	c

1	2	10

3	4	1020

5	6	130

INSERT t1 SELECT 1,4,60 FROM DUAL ON DUPLICATE KEY UPDATE c=c+10000;

SELECT * FROM t1;

a	b	c

1	2	10010

3	4	1020

5	6	130

INSERT t1 SELECT 1,9,70 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100000, b=4;

ERROR 23000: Duplicate entry '4' for key 2

SELECT * FROM t1;

a	b	c

1	2	10010

3	4	1020

5	6	130

TRUNCATE TABLE t1;

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

CREATE TABLE t2 (x INT, y INT, z INT, d INT);

INSERT t2 VALUES (5,6,30,1), (7,4,40,1), (8,9,60,1);

INSERT t2 VALUES (2,1,11,2), (7,4,40,2);

INSERT t1 SELECT x,y,z FROM t2 WHERE d=1 ON DUPLICATE KEY UPDATE c=c+100;

SELECT * FROM t1;

a	b	c

1	2	10

3	4	120

5	6	30

8	9	60

INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0;

SELECT * FROM t1;

a	b	c

1	2	10

3	4	120

5	0	30

8	9	60

INSERT t1 SELECT x,y,z FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a);

SELECT *, VALUES(a) FROM t1;

a	b	c	VALUES(a)

1	2	10	NULL

3	4	127	NULL

5	0	30	NULL

8	9	60	NULL

2	1	11	NULL

DROP TABLE t1;

DROP TABLE t2;

mysql-test/r/subselect.result

+28 −6
Original line number Diff line number Diff line
@@ -1490,9 +1490,6 @@ Warnings: 
Note	1003	select test.t3.a AS `a` from test.t3 where <not>((test.t3.a < (select max(test.t2.b) from test.t2)))

select * from t3 where a >= some (select b from t2);

a

6

7

3

explain extended select * from t3 where a >= some (select b from t2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -1512,9 +1509,6 @@ Warnings: 
Note	1003	select test.t3.a AS `a` from test.t3 where <not>((test.t3.a < <max>(select test.t2.b AS `b` from test.t2 group by test.t2.b)))

select * from t3 where a >= some (select b from t2 group by 1);

a

6

7

3

explain extended select * from t3 where a >= some (select b from t2 group by 1);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where
@@ -2105,3 +2099,31 @@ s1 s1 < all (select s1 from t1) 
1	0

NULL	NULL

drop table t1;

CREATE TABLE t1 (

Code char(3) NOT NULL default '',

Name char(52) NOT NULL default '',

Continent enum('Asia','Europe','North America','Africa','Oceania','Antarctica','South America') NOT NULL default 'Asia',

Region char(26) NOT NULL default '',

SurfaceArea float(10,2) NOT NULL default '0.00',

IndepYear smallint(6) default NULL,

Population int(11) NOT NULL default '0',

LifeExpectancy float(3,1) default NULL,

GNP float(10,2) default NULL,

GNPOld float(10,2) default NULL,

LocalName char(45) NOT NULL default '',

GovernmentForm char(45) NOT NULL default '',

HeadOfState char(60) default NULL,

Capital int(11) default NULL,

Code2 char(2) NOT NULL default ''

) TYPE=MyISAM;

Warnings:

Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead

INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');

INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');

INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes franaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');

INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');

/*!40000 ALTER TABLE t1 ENABLE KEYS */;

SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);

c

Oceania

drop table t1;

mysql-test/t/insert_update.test

+31 −0
Original line number Diff line number Diff line
@@ -48,3 +48,34 @@ disable_info; 


select * from t1;

drop table t1;



# WorkLog #2274 - enable INSERT .. SELECT .. UPDATE syntax

# Same tests as beginning of this test except that insert source

# is a result from a select statement

#

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

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

INSERT t1 SELECT 5,6,30 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;

SELECT * FROM t1;

INSERT t1 SELECT 5,7,40 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100;

SELECT * FROM t1;

INSERT t1 SELECT 8,4,50 FROM DUAL ON DUPLICATE KEY UPDATE c=c+1000;

SELECT * FROM t1;

INSERT t1 SELECT 1,4,60 FROM DUAL ON DUPLICATE KEY UPDATE c=c+10000;

SELECT * FROM t1;

-- error 1062

INSERT t1 SELECT 1,9,70 FROM DUAL ON DUPLICATE KEY UPDATE c=c+100000, b=4;

SELECT * FROM t1;

TRUNCATE TABLE t1;

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

CREATE TABLE t2 (x INT, y INT, z INT, d INT);

INSERT t2 VALUES (5,6,30,1), (7,4,40,1), (8,9,60,1);

INSERT t2 VALUES (2,1,11,2), (7,4,40,2);

INSERT t1 SELECT x,y,z FROM t2 WHERE d=1 ON DUPLICATE KEY UPDATE c=c+100;

SELECT * FROM t1;

INSERT t1 SET a=5 ON DUPLICATE KEY UPDATE b=0;

SELECT * FROM t1;

INSERT t1 SELECT x,y,z FROM t2 WHERE d=2 ON DUPLICATE KEY UPDATE c=c+VALUES(a);

SELECT *, VALUES(a) FROM t1;

DROP TABLE t1;

DROP TABLE t2;

mysql-test/t/subselect.test

+28 −0
Original line number Diff line number Diff line
@@ -1358,3 +1358,31 @@ insert into t1 values (1),(null); 
select * from t1 where s1 < all (select s1 from t1);

select s1, s1 < all (select s1 from t1) from t1;

drop table t1;



#

# reference on changable fields from subquery

#

CREATE TABLE t1 (

  Code char(3) NOT NULL default '',

  Name char(52) NOT NULL default '',

  Continent enum('Asia','Europe','North America','Africa','Oceania','Antarctica','South America') NOT NULL default 'Asia',

  Region char(26) NOT NULL default '',

  SurfaceArea float(10,2) NOT NULL default '0.00',

  IndepYear smallint(6) default NULL,

  Population int(11) NOT NULL default '0',

  LifeExpectancy float(3,1) default NULL,

  GNP float(10,2) default NULL,

  GNPOld float(10,2) default NULL,

  LocalName char(45) NOT NULL default '',

  GovernmentForm char(45) NOT NULL default '',

  HeadOfState char(60) default NULL,

  Capital int(11) default NULL,

  Code2 char(2) NOT NULL default ''

) TYPE=MyISAM;

INSERT INTO t1 VALUES ('XXX','Xxxxx','Oceania','Xxxxxx',26.00,0,0,0,0,0,'Xxxxx','Xxxxx','Xxxxx',NULL,'XX');

INSERT INTO t1 VALUES ('ASM','American Samoa','Oceania','Polynesia',199.00,0,68000,75.1,334.00,NULL,'Amerika Samoa','US Territory','George W. Bush',54,'AS');

INSERT INTO t1 VALUES ('ATF','French Southern territories','Antarctica','Antarctica',7780.00,0,0,NULL,0.00,NULL,'Terres australes franaises','Nonmetropolitan Territory of France','Jacques Chirac',NULL,'TF');

INSERT INTO t1 VALUES ('UMI','United States Minor Outlying Islands','Oceania','Micronesia/Caribbean',16.00,0,0,NULL,0.00,NULL,'United States Minor Outlying Islands','Dependent Territory of the US','George W. Bush',NULL,'UM');

/*!40000 ALTER TABLE t1 ENABLE KEYS */;

SELECT DISTINCT Continent AS c FROM t1 WHERE Code <> SOME ( SELECT Code FROM t1 WHERE Continent = c AND Population < 200);

drop table t1;