diff options
| author | unknown <sergefp@mysql.com> | 2005-12-26 14:56:15 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-12-26 14:56:15 +0300 |
| commit | e6cf611fe2382e2b2679dcbc7fca20f3e718c4d2 (patch) | |
| tree | 3a28c9b3bd246795cf59f2badf4b64058cbad745 /sql/sql_class.cc | |
| parent | 66f962d808111c63e4aa03371b5520beb72c3a73 (diff) | |
| parent | b3abc9773e9944fb8b0c70c63ff2a6b1d4210366 (diff) | |
| download | mariadb-git-e6cf611fe2382e2b2679dcbc7fca20f3e718c4d2.tar.gz | |
Merge newbox:mysql-5.1-ppruning-r4
into pylon.mylan:/home/psergey/mysql-5.1-26dec-merge
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/handler.h:
Merge
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 08d89228a72..7c6f61d6edc 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -755,6 +755,13 @@ int THD::send_explain_fields(select_result *result) field_list.push_back(new Item_empty_string("select_type", 19, cs)); field_list.push_back(item= new Item_empty_string("table", NAME_LEN, cs)); item->maybe_null= 1; +#ifdef WITH_PARTITION_STORAGE_ENGINE + if (lex->describe & DESCRIBE_PARTITIONS) + { + field_list.push_back(item= new Item_empty_string("partitions", 10, cs)); + item->maybe_null= 1; + } +#endif field_list.push_back(item= new Item_empty_string("type", 10, cs)); item->maybe_null= 1; field_list.push_back(item=new Item_empty_string("possible_keys", |