diff options
| author | unknown <sergefp@mysql.com> | 2006-01-18 14:09:08 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2006-01-18 14:09:08 +0300 |
| commit | 18a1e69ebaa46722c49c493f23ee45c4cf847c3c (patch) | |
| tree | 125d1e6899817ba566c75f28a00bfcef1f98a7a4 /sql/sql_class.cc | |
| parent | b58c076c1898ec5f994660063df20ace2f1924e9 (diff) | |
| parent | 0f1fa93af8708ea34326039f844ddd6ac053687c (diff) | |
| download | mariadb-git-18a1e69ebaa46722c49c493f23ee45c4cf847c3c.tar.gz | |
Manual merge
mysql-test/r/partition.result:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 3d5c9ac79b6..4863fe7831c 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -763,7 +763,10 @@ int THD::send_explain_fields(select_result *result) #ifdef WITH_PARTITION_STORAGE_ENGINE if (lex->describe & DESCRIBE_PARTITIONS) { - field_list.push_back(item= new Item_empty_string("partitions", 10, cs)); + /* Maximum length of string that make_used_partitions_str() can produce */ + item= new Item_empty_string("partitions", MAX_PARTITIONS * (1 + FN_LEN), + cs); + field_list.push_back(item); item->maybe_null= 1; } #endif |