diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 2ca5b2c7916fe5312617aa992d5292e724af75f0 (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /sql/item_subselect.cc | |
| parent | 7a90f041cc3b6db8600e9469cab6d436653552ec (diff) | |
| parent | 26fc5583196f7b88256cb733be033757a0517266 (diff) | |
| download | mariadb-git-2ca5b2c7916fe5312617aa992d5292e724af75f0.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index d16710f6660..335b9f79e78 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -311,9 +311,14 @@ void Item_subselect::update_used_tables() void Item_subselect::print(String *str, enum_query_type query_type) { - str->append('('); - engine->print(str, query_type); - str->append(')'); + if (engine) + { + str->append('('); + engine->print(str, query_type); + str->append(')'); + } + else + str->append("(...)"); } |