diff options
author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-07-01 13:27:09 +0300 |
---|---|---|
committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-07-01 13:27:09 +0300 |
commit | cdfc04fb0819109ba3f7b78e87191b9b8311b9bf (patch) | |
tree | 6d24d9f1268cc8482f927f28041b09cd839de584 /sql/sql_class.h | |
parent | 2752103dba17e2c96f72e121b36fe4fd8b3e2d61 (diff) | |
parent | b291238171449fd01fb50b13631719382a73857c (diff) | |
download | mariadb-git-cdfc04fb0819109ba3f7b78e87191b9b8311b9bf.tar.gz |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
BitKeeper/etc/ignore:
auto-union
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r-- | sql/sql_class.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 1aa9e65fa74..14055a1444c 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -410,6 +410,8 @@ public: ** This is used to get result from a select */ +class JOIN; + class select_result :public Sql_alloc { protected: THD *thd; @@ -419,6 +421,7 @@ public: virtual int prepare(List<Item> &list) { return 0; } virtual bool send_fields(List<Item> &list,uint flag)=0; virtual bool send_data(List<Item> &items)=0; + virtual void initialize_tables (JOIN *join=0) {}; virtual void send_error(uint errcode,const char *err)=0; virtual bool send_eof()=0; virtual void abort() {} @@ -621,6 +624,7 @@ public: bool send_fields(List<Item> &list, uint flag) { return 0; } bool send_data(List<Item> &items); + void initialize_tables (JOIN *join); void send_error(uint errcode,const char *err); int do_deletes (bool from_send_error); bool send_eof(); |