diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-09-10 02:22:44 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-09-10 02:22:44 +0300 |
| commit | b386f888da6eaf55c50d5ee9f8c2fa46c6b0cbf2 (patch) | |
| tree | b045cc181c0717a5a6787cfc01d4a6744ac330c6 /mysql-test/t/merge.test | |
| parent | ed2c4854dd9d6b75f052d0f7e824b68cc68e35d0 (diff) | |
| download | mariadb-git-b386f888da6eaf55c50d5ee9f8c2fa46c6b0cbf2.tar.gz | |
post merge fixes
mysql-test/t/merge.test:
additional test
sql/item.h:
parameter to detect need of saving view field names
sql/item_subselect.cc:
arena fix
used nearest thd pointer
sql/item_sum.cc:
after merge fix
sql/mysql_priv.h:
after merge fix
sql/sql_base.cc:
fixed unique test
fixed postmerge arena mamgement
sql/sql_class.h:
mey method to detect conventional execution
sql/sql_handler.cc:
new parameter
sql/sql_lex.cc:
fixed postmerge arena mamgement
sql/sql_parse.cc:
fixed unique test
sql/sql_select.cc:
fixed postmerge arena mamgement
sql/sql_union.cc:
fixed postmerge arena mamgement
sql/sql_view.cc:
fixed postmerge arena mamgement
sql/table.cc:
fixed postmerge arena mamgement
Diffstat (limited to 'mysql-test/t/merge.test')
| -rw-r--r-- | mysql-test/t/merge.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test index 9580c1ab44c..9d367260049 100644 --- a/mysql-test/t/merge.test +++ b/mysql-test/t/merge.test @@ -284,4 +284,6 @@ insert into t2 values (1); create table t3 engine=merge union=(t1, t2) select * from t1; --error 1093 create table t3 engine=merge union=(t1, t2) select * from t2; +--error 1093 +create table t3 engine=merge union=(t1, t2) select (select max(a) from t2); drop table t1, t2; |