diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-20 19:49:38 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-03-20 19:49:38 +0200 |
| commit | bac27bb9f5c6586e1993e6fef6c513cd79dd2306 (patch) | |
| tree | 563495cf458bd9a81b6885b7855f23c12fd43c68 /sql/sql_class.h | |
| parent | 3798a7d5008f8f569f779f096b7fc1e1cfac1031 (diff) | |
| parent | 9c89dd654e90d85fefc2459711063b680ed10f24 (diff) | |
| download | mariadb-git-bac27bb9f5c6586e1993e6fef6c513cd79dd2306.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B24484-5.0
mysql-test/r/subselect3.result:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 99803802001..048da718dfd 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1492,6 +1492,9 @@ public: query_id_t first_query_id; } binlog_evt_union; + /* pass up the count of "leaf" tables in a JOIN out of setup_tables() */ + byte leaf_count; + THD(); ~THD(); |