diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 12:20:51 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 12:20:51 +0400 |
| commit | d152debde52cf1a8c3690a05fc6fe54f613fc008 (patch) | |
| tree | eddfd478f114ee98f384a977c9aee7847e9376e4 /sql/sql_class.h | |
| parent | 8ed9a54008fae160d63dc27fa02b9ae4348238e7 (diff) | |
| parent | 9f9e2f2df02ba7cbeb075ea345f979eb244f97a6 (diff) | |
| download | mariadb-git-d152debde52cf1a8c3690a05fc6fe54f613fc008.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
libmysqld/lib_sql.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 11bf0f05d13..a9915fce4ef 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1411,7 +1411,10 @@ public: #ifdef WITH_PARTITION_STORAGE_ENGINE partition_info *work_part_info; #endif - + + /* pass up the count of "leaf" tables in a JOIN out of setup_tables() */ + byte leaf_count; + THD(); ~THD(); |