diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-09-09 15:26:47 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-09-09 15:26:47 +0200 |
| commit | 36aeee3682fa975df244f44fb34e1c05f3263551 (patch) | |
| tree | 8b8e4544543c49e86d358196df4f951aa55502dd /sql/sql_select.h | |
| parent | de82d9eec0fd1d55c225a2420572b6e5e59ff8f7 (diff) | |
| parent | 057855a34a2efbbca11ab2428c44790a52c401d9 (diff) | |
| download | mariadb-git-36aeee3682fa975df244f44fb34e1c05f3263551.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
include/my_global.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/NodeFailRep.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/ndbapi/Makefile.am:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 77a3f872064..ce40f657a8e 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -231,7 +231,7 @@ class JOIN :public Sql_alloc /* Is set if we have a GROUP BY and we have ORDER BY on a constant. */ bool skip_sort_order; - bool need_tmp, hidden_group_fields, buffer_result; + bool need_tmp, hidden_group_fields; DYNAMIC_ARRAY keyuse; Item::cond_result cond_value; List<Item> all_fields; // to store all fields that used in query @@ -300,8 +300,6 @@ class JOIN :public Sql_alloc skip_sort_order= 0; need_tmp= 0; hidden_group_fields= 0; /*safety*/ - buffer_result= test(select_options & OPTION_BUFFER_RESULT) && - !test(select_options & OPTION_FOUND_ROWS); error= 0; select= 0; return_tab= 0; |