Commit a29a6637 authored by unknown's avatar unknown
Browse files

Merge msvensson@build.mysql.com:/home/bk/mysql-4.1 

into neptunus.(none):/home/magnus/mysql/mysql-4.1
parents 812a0749 90bcde83

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ miguel@light.local 
miguel@sartre.local

mikron@c-fb0ae253.1238-1-64736c10.cust.bredbandsbolaget.se

mikron@mikael-ronstr-ms-dator.local

mleich@mysql.com

mmatthew@markslaptop.

monty@bitch.mysql.fi

monty@butch.

mysql-test/include/ps_modify.inc

+7 −7
Original line number Diff line number Diff line
@@ -110,10 +110,10 @@ select a,b from t1 where a=@arg00; 
set @arg00=NULL;

set @arg01=2;

execute stmt1 using @arg00, @arg01;

select a,b from t1;

select a,b from t1 order by a;

set @arg00=0;

execute stmt1 using @arg01, @arg00;

select a,b from t1;

select a,b from t1 order by a;



## update with subquery and several parameters

set @arg00=23;
@@ -134,7 +134,7 @@ prepare stmt1 from 'update t1 set a=? where b=? 
                    and a not in (select ? from t2

                              where b = ? or a = ?)';

execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ;

select a,b from t1 ;

select a,b from t1 order by a;

drop table t2 ;



## update with parameters in limit
@@ -202,7 +202,7 @@ set @arg01=1 ; 
prepare stmt1 from 'insert into t1 set a=?, b=''sechs''

                    on duplicate key update a=a + ?, b=concat(b,''modified'') ';

execute stmt1 using @arg00, @arg01;

select * from t1;

select * from t1 order by a;

set @arg00=81 ;

set @arg01=1 ;

--error 1062
@@ -221,17 +221,17 @@ set @updated="updated" ; 
insert into t1 values(1000,'x1000_1') ;

insert into t1 values(@1000,@x1000_2),(@1000,@x1000_3)

               on duplicate key update a = a + @100, b = concat(b,@updated) ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

delete from t1 where a >= 1000 ;

insert into t1 values(1000,'x1000_1') ;

prepare stmt1 from ' insert into t1 values(?,?),(?,?)

               on duplicate key update a = a + ?, b = concat(b,?) ';

execute stmt1 using @1000, @x1000_2, @1000, @x1000_3, @100, @updated ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

delete from t1 where a >= 1000 ;

insert into t1 values(1000,'x1000_1') ;

execute stmt1 using @1000, @x1000_2, @1100, @x1000_3, @100, @updated ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

delete from t1 where a >= 1000 ;



## replace

mysql-test/include/ps_modify1.inc

+5 −5
Original line number Diff line number Diff line
@@ -45,19 +45,19 @@ 
set @duplicate='duplicate ' ;

set @1000=1000 ;

set @5=5 ;

select a,b from t1 where a < 5 ;

select a,b from t1 where a < 5 order by a ;

--enable_info

insert into t1 select a + @1000, concat(@duplicate,b) from t1

where a < @5 ;

--disable_info

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

delete from t1 where a >= 1000 ;

prepare stmt1 from ' insert into t1 select a + ?, concat(?,b) from t1

where a < ? ' ;

--enable_info

execute stmt1 using @1000, @duplicate, @5;

--disable_info

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

delete from t1 where a >= 1000 ;



set @float=1.00;
@@ -78,7 +78,7 @@ select b, a + @100 from t1 
  where (a,b) in ( select sqrt(a+@1)+CAST(@float AS signed),b 

                 from t1);

--disable_info

select a,b from t2;

select a,b from t2 order by a ;

delete from t2 ;

prepare stmt1 from ' insert into t2 (b,a) 

select ?, sum(first.a)
@@ -93,5 +93,5 @@ select b, a + ? from t1 
--enable_info

execute stmt1 using @duplicate, @5, @five, @2, @100, @1, @float ;

--disable_info

select a,b from t2;

select a,b from t2 order by a ;

drop table t2;

mysql-test/r/ps_2myisam.result

+31 −31
Original line number Diff line number Diff line
@@ -1016,15 +1016,15 @@ set @arg01=2; 
execute stmt1 using @arg00, @arg01;

Warnings:

Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1

select a,b from t1;

select a,b from t1 order by a;

a	b

1	one

0	two

1	one

3	three

4	four

set @arg00=0;

execute stmt1 using @arg01, @arg00;

select a,b from t1;

select a,b from t1 order by a;

a	b

1	one

2	two
@@ -1048,7 +1048,7 @@ prepare stmt1 from 'update t1 set a=? where b=? 
                    and a not in (select ? from t2

                              where b = ? or a = ?)';

execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ;

select a,b from t1 ;

select a,b from t1 order by a;

a	b

1	one

2	two
@@ -1142,19 +1142,19 @@ set @arg01=1 ; 
prepare stmt1 from 'insert into t1 set a=?, b=''sechs''

                    on duplicate key update a=a + ?, b=concat(b,''modified'') ';

execute stmt1 using @arg00, @arg01;

select * from t1;

select * from t1 order by a;

a	b

0	NULL

1	one

2	two

3	three

4	four

5	five

7	sixmodified

0	NULL

8	eight

9	nine

81	8-1

82	8-2

9	nine

set @arg00=81 ;

set @arg01=1 ;

execute stmt1 using @arg00, @arg01;
@@ -1170,7 +1170,7 @@ set @updated="updated" ; 
insert into t1 values(1000,'x1000_1') ;

insert into t1 values(@1000,@x1000_2),(@1000,@x1000_3)

on duplicate key update a = a + @100, b = concat(b,@updated) ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	x1000_3

1100	x1000_1updated
@@ -1179,14 +1179,14 @@ insert into t1 values(1000,'x1000_1') ; 
prepare stmt1 from ' insert into t1 values(?,?),(?,?)

               on duplicate key update a = a + ?, b = concat(b,?) ';

execute stmt1 using @1000, @x1000_2, @1000, @x1000_3, @100, @updated ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	x1000_3

1100	x1000_1updated

delete from t1 where a >= 1000 ;

insert into t1 values(1000,'x1000_1') ;

execute stmt1 using @1000, @x1000_2, @1100, @x1000_3, @100, @updated ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;
@@ -1195,37 +1195,37 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye 
set @duplicate='duplicate ' ;

set @1000=1000 ;

set @5=5 ;

select a,b from t1 where a < 5 ;

select a,b from t1 where a < 5 order by a ;

a	b

0	NULL

1	one

2	two

3	three

4	four

0	NULL

insert into t1 select a + @1000, concat(@duplicate,b) from t1

where a < @5 ;

affected rows: 5

info: Records: 5  Duplicates: 0  Warnings: 0

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	NULL

1001	duplicate one

1002	duplicate two

1003	duplicate three

1004	duplicate four

1000	NULL

delete from t1 where a >= 1000 ;

prepare stmt1 from ' insert into t1 select a + ?, concat(?,b) from t1

where a < ? ' ;

execute stmt1 using @1000, @duplicate, @5;

affected rows: 5

info: Records: 5  Duplicates: 0  Warnings: 0

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1004	duplicate four

1003	duplicate three

1002	duplicate two

1001	duplicate one

1000	NULL

1001	duplicate one

1002	duplicate two

1003	duplicate three

1004	duplicate four

delete from t1 where a >= 1000 ;

set @float=1.00;

set @five='five' ;
@@ -1243,15 +1243,15 @@ where (a,b) in ( select sqrt(a+@1)+CAST(@float AS signed),b 
from t1);

affected rows: 8

info: Records: 8  Duplicates: 0  Warnings: 0

select a,b from t2;

select a,b from t2 order by a ;

a	b

81	duplicate

82	duplicate

8	duplicate

3	duplicate

4	duplicate

9	duplicate

7	duplicate

3	duplicate

8	duplicate

9	duplicate

81	duplicate

82	duplicate

103	three

delete from t2 ;

prepare stmt1 from ' insert into t2 (b,a)
@@ -1267,15 +1267,15 @@ select b, a + ? from t1 
execute stmt1 using @duplicate, @5, @five, @2, @100, @1, @float ;

affected rows: 8

info: Records: 8  Duplicates: 0  Warnings: 0

select a,b from t2;

select a,b from t2 order by a ;

a	b

81	duplicate

82	duplicate

8	duplicate

3	duplicate

4	duplicate

9	duplicate

7	duplicate

3	duplicate

8	duplicate

9	duplicate

81	duplicate

82	duplicate

103	three

drop table t2;

drop table t1, t_many_col_types;

mysql-test/r/ps_3innodb.result

+12 −12
Original line number Diff line number Diff line
@@ -1016,7 +1016,7 @@ set @arg01=2; 
execute stmt1 using @arg00, @arg01;

Warnings:

Warning	1263	Data truncated; NULL supplied to NOT NULL column 'a' at row 1

select a,b from t1;

select a,b from t1 order by a;

a	b

0	two

1	one
@@ -1024,7 +1024,7 @@ a b 
4	four

set @arg00=0;

execute stmt1 using @arg01, @arg00;

select a,b from t1;

select a,b from t1 order by a;

a	b

1	one

2	two
@@ -1048,7 +1048,7 @@ prepare stmt1 from 'update t1 set a=? where b=? 
                    and a not in (select ? from t2

                              where b = ? or a = ?)';

execute stmt1 using @arg04, @arg01, @arg02, @arg03, @arg00 ;

select a,b from t1 ;

select a,b from t1 order by a;

a	b

1	one

2	two
@@ -1142,7 +1142,7 @@ set @arg01=1 ; 
prepare stmt1 from 'insert into t1 set a=?, b=''sechs''

                    on duplicate key update a=a + ?, b=concat(b,''modified'') ';

execute stmt1 using @arg00, @arg01;

select * from t1;

select * from t1 order by a;

a	b

0	NULL

1	one
@@ -1170,7 +1170,7 @@ set @updated="updated" ; 
insert into t1 values(1000,'x1000_1') ;

insert into t1 values(@1000,@x1000_2),(@1000,@x1000_3)

on duplicate key update a = a + @100, b = concat(b,@updated) ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	x1000_3

1100	x1000_1updated
@@ -1179,14 +1179,14 @@ insert into t1 values(1000,'x1000_1') ; 
prepare stmt1 from ' insert into t1 values(?,?),(?,?)

               on duplicate key update a = a + ?, b = concat(b,?) ';

execute stmt1 using @1000, @x1000_2, @1000, @x1000_3, @100, @updated ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	x1000_3

1100	x1000_1updated

delete from t1 where a >= 1000 ;

insert into t1 values(1000,'x1000_1') ;

execute stmt1 using @1000, @x1000_2, @1100, @x1000_3, @100, @updated ;

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1200	x1000_1updatedupdated

delete from t1 where a >= 1000 ;
@@ -1195,7 +1195,7 @@ ERROR HY000: This command is not supported in the prepared statement protocol ye 
set @duplicate='duplicate ' ;

set @1000=1000 ;

set @5=5 ;

select a,b from t1 where a < 5 ;

select a,b from t1 where a < 5 order by a ;

a	b

0	NULL

1	one
@@ -1206,7 +1206,7 @@ insert into t1 select a + @1000, concat(@duplicate,b) from t1 
where a < @5 ;

affected rows: 5

info: Records: 5  Duplicates: 0  Warnings: 0

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	NULL

1001	duplicate one
@@ -1219,7 +1219,7 @@ where a < ? ' ; 
execute stmt1 using @1000, @duplicate, @5;

affected rows: 5

info: Records: 5  Duplicates: 0  Warnings: 0

select a,b from t1 where a >= 1000 ;

select a,b from t1 where a >= 1000 order by a ;

a	b

1000	NULL

1001	duplicate one
@@ -1243,7 +1243,7 @@ where (a,b) in ( select sqrt(a+@1)+CAST(@float AS signed),b 
from t1);

affected rows: 8

info: Records: 8  Duplicates: 0  Warnings: 0

select a,b from t2;

select a,b from t2 order by a ;

a	b

3	duplicate

4	duplicate
@@ -1267,7 +1267,7 @@ select b, a + ? from t1 
execute stmt1 using @duplicate, @5, @five, @2, @100, @1, @float ;

affected rows: 8

info: Records: 8  Duplicates: 0  Warnings: 0

select a,b from t2;

select a,b from t2 order by a ;

a	b

3	duplicate

4	duplicate