summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorunknown <gkodinov/kgeorge@magare.gmz>2007-03-26 17:03:57 +0300
committerunknown <gkodinov/kgeorge@magare.gmz>2007-03-26 17:03:57 +0300
commit9887430fc0220b60f2db33d611e90aa939923811 (patch)
tree6d00e687736fd42c31993c71c3b97e223e0f46ae /sql/sql_class.h
parenta88dac081ec84e28d5143e9e7ac5b5bfa3ddfb02 (diff)
parentec5051fff447914216c87378930d6234735da3a7 (diff)
downloadmariadb-git-9887430fc0220b60f2db33d611e90aa939923811.tar.gz
Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/WL3527-5.1-opt mysql-test/r/gis.result: Auto merged mysql-test/t/gis.test: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/subselect.result: merge 5.0-opt -> 5.1-opt mysql-test/t/subselect.test: merge 5.0-opt -> 5.1-opt sql/sql_base.cc: merge 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index a9915fce4ef..d4868cc1934 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1412,9 +1412,6 @@ public:
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();