diff options
| author | unknown <sergefp@mysql.com> | 2005-01-19 23:02:28 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-01-19 23:02:28 +0300 |
| commit | c8343423c2e152536f3b8b5265d0f3746625894e (patch) | |
| tree | 3a30df1c0870ae909348c60e404a64fd76cbc792 /sql | |
| parent | fa0935dead04963ed7d03fe3b0a8e1e79077042b (diff) | |
| parent | 2e50981af908bff71c330d4caff40338ee2356d8 (diff) | |
| download | mariadb-git-c8343423c2e152536f3b8b5265d0f3746625894e.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index e1a80941a52..8516ea76a7e 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -177,6 +177,8 @@ bool Item_subselect::fix_fields(THD *thd_param, TABLE_LIST *tables, Item **ref) } fix_length_and_dec(); } + else + return 1; uint8 uncacheable= engine->uncacheable(); if (uncacheable) { @@ -264,7 +266,6 @@ Item_singlerow_subselect::Item_singlerow_subselect(st_select_lex *select_lex) { DBUG_ENTER("Item_singlerow_subselect::Item_singlerow_subselect"); init(select_lex, new select_singlerow_subselect(this)); - max_columns= 1; maybe_null= 1; max_columns= UINT_MAX; DBUG_VOID_RETURN; |