diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-19 19:36:14 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-19 19:36:14 +0300 |
| commit | eacc937d48babce40829b729bb9dfe2711a43d17 (patch) | |
| tree | 688c26274e23ab44604f2f276f6a5c78e49241bf /mysql-test/r/sp.result | |
| parent | dedfdb490ba528ddf3f9155a4fb6f0b3728df149 (diff) | |
| parent | 8a433bc4dcee5c6c6a59eadd0b6d4c8275e18234 (diff) | |
| download | mariadb-git-eacc937d48babce40829b729bb9dfe2711a43d17.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- configure.in
- include/m_string.h
- mysql-test/extra/rpl_tests/rpl_row_func003.test
- mysql-test/r/mysqlbinlog.result
- mysql-test/r/union.result
- mysql-test/suite/binlog/r/binlog_killed_simulate.result
- mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
- mysql-test/suite/binlog/r/binlog_unsafe.result
- mysql-test/suite/binlog/t/binlog_unsafe.test
- mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
- mysql-test/suite/rpl/r/rpl_loaddata_map.result
- mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
- mysql-test/suite/rpl/r/rpl_stm_log.result
- mysql-test/suite/rpl/t/rpl_optimize.test
- mysql-test/t/mysqlbinlog.test
- mysql-test/t/union.test
- sql/rpl_utility.h
- sql/sql_union.cc
- strings/Makefile.am
Diffstat (limited to 'mysql-test/r/sp.result')
| -rw-r--r-- | mysql-test/r/sp.result | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 8f756a4c303..b702a3eaee3 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -6929,6 +6929,22 @@ CALL p1(); CALL p1(); DROP PROCEDURE p1; DROP TABLE t1; +CREATE TABLE t1 ( f1 integer, primary key (f1)); +CREATE TABLE t2 LIKE t1; +CREATE TEMPORARY TABLE t3 LIKE t1; +CREATE PROCEDURE p1 () BEGIN SELECT f1 FROM t3 AS A WHERE A.f1 IN ( SELECT f1 FROM t3 ) ; +END| +CALL p1; +ERROR HY000: Can't reopen table: 'A' +CREATE VIEW t3 AS SELECT f1 FROM t2 A WHERE A.f1 IN ( SELECT f1 FROM t2 ); +DROP TABLE t3; +CALL p1; +f1 +CALL p1; +f1 +DROP PROCEDURE p1; +DROP TABLE t1, t2; +DROP VIEW t3; # # Bug #46629: Item_in_subselect::val_int(): Assertion `0' # on subquery inside a SP |