summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <reggie@big_geek.>2006-02-16 11:07:21 -0600
committerunknown <reggie@big_geek.>2006-02-16 11:07:21 -0600
commit8270eb50e434768810f9569df31207f9764051e0 (patch)
tree21d039143862f8515be83bd328410e5dcba882c1 /sql/sql_show.cc
parented8b7459096048e14b4f4f50117bc1bde856eefc (diff)
parentd047fe77b74b02550d3b72fbb9415d3e8a9f507a (diff)
downloadmariadb-git-8270eb50e434768810f9569df31207f9764051e0.tar.gz
Merge reggie@192.168.0.9:/home/reggie/work/mysql-5.1-bug15408
into big_geek.:C:/Work/mysql/mysql-5.1-bug15408 sql/ha_partition.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_show.cc: Auto merged sql/handler.h: merging changes into my partition code reorg
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 11b9547217b..5b2549c4ed3 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3770,7 +3770,7 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
table->field[9]->set_notnull();
}
- if (is_sub_partitioned(part_info))
+ if (part_info->is_sub_partitioned())
{
/* Subpartition method */
if (part_info->list_of_subpart_fields)