Commit 7da5dc14 authored by MySQL Build Team's avatar MySQL Build Team

Backport into build-201002030816-5.0.87sp1

> ------------------------------------------------------------
> revno: 2818.1.41 [merge]
> revision-id: epotemkin@mysql.com-20091203132153-k8xwk3nh02n8npg4
> parent: epotemkin@mysql.com-20091202134712-4muwnr152xqkcwm7
> parent: epotemkin@mysql.com-20091203131520-93uiop1a81o9z8mb
> committer: Evgeny Potemkin <epotemkin@mysql.com>
> branch nick: mysql-5.0-bugteam
> timestamp: Thu 2009-12-03 16:21:53 +0300
> message:
>   Auto-merged.
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.
parent cb6780d2
...@@ -1902,6 +1902,7 @@ execute stmt; ...@@ -1902,6 +1902,7 @@ execute stmt;
a a
execute stmt; execute stmt;
a a
deallocate prepare stmt;
drop table t1; drop table t1;
drop view v1; drop view v1;
create table t1(a bigint); create table t1(a bigint);
...@@ -1912,6 +1913,7 @@ execute stmt; ...@@ -1912,6 +1913,7 @@ execute stmt;
1 1
execute stmt; execute stmt;
1 1
deallocate prepare stmt;
drop table t1,t2; drop table t1,t2;
# #
End of 5.0 tests. End of 5.0 tests.
...@@ -1982,6 +1982,7 @@ create view v1 AS select 1 as a from t1 where b; ...@@ -1982,6 +1982,7 @@ create view v1 AS select 1 as a from t1 where b;
prepare stmt from "select * from v1 where a"; prepare stmt from "select * from v1 where a";
execute stmt; execute stmt;
execute stmt; execute stmt;
deallocate prepare stmt;
drop table t1; drop table t1;
drop view v1; drop view v1;
...@@ -1991,6 +1992,7 @@ insert into t2 values (null); ...@@ -1991,6 +1992,7 @@ insert into t2 values (null);
prepare stmt from "select 1 from t1 join t2 on a xor b where b > 1 and a =1"; prepare stmt from "select 1 from t1 join t2 on a xor b where b > 1 and a =1";
execute stmt; execute stmt;
execute stmt; execute stmt;
deallocate prepare stmt;
drop table t1,t2; drop table t1,t2;
--echo # --echo #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment