diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-28 12:10:44 +0100 |
| commit | 1387e71531495b1224bfafd6867ae5fae9cf469c (patch) | |
| tree | 6307410443d2eeee3817acf552e3ce583e9444d8 /sql/sql_show.cc | |
| parent | 44db9c41b389a2eacdd9591f825ed86e9bffd0e8 (diff) | |
| download | mariadb-git-1387e71531495b1224bfafd6867ae5fae9cf469c.tar.gz | |
MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1
merged from 5.6:
Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING
Bug#16589511: MYSQL_UPGRADE FAILS TO WRITE OUT ENTIRE ALTER TABLE ... ALGORITHM= ... STATEMENT
Bug#16274455: CAN NOT ACESS PARTITIONED TABLES WHEN DOWNGRADED FROM 5.6.11 TO 5.6.10
plus minor changes from 5.6, mainly comments
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index fc86722a1bf..82fbf3b124a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1754,13 +1754,8 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, table->field[key_part->fieldnr-1]->key_length() && !(key_info->flags & (HA_FULLTEXT | HA_SPATIAL)))) { - char *end; - buff[0] = '('; - end= int10_to_str((long) key_part->length / - key_part->field->charset()->mbmaxlen, - buff + 1,10); - *end++ = ')'; - packet->append(buff,(uint) (end-buff)); + packet->append_parenthesized((long) key_part->length / + key_part->field->charset()->mbmaxlen); } } packet->append(')'); @@ -1958,7 +1953,8 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, &part_syntax_len, FALSE, show_table_options, - NULL, NULL))) + NULL, NULL, + comment_start.c_ptr()))) { packet->append(comment_start); if (packet->append(part_syntax, part_syntax_len) || |