From 5fd7e5e32cc0878f131856ea9e59594293db07d9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 17 Oct 2006 01:02:12 +1000 Subject: BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11 post-review fixes. Magnus suggested use of DYNAMIC_STRING instead of futzing with c strings. also making usage of TABLEs clearer in store_schema_partitions_record. client/mysqldump.c: Use DYNAMIC_STRING in code for dumping tablespaces sql/sql_show.cc: Make use of schema_table versus the table we're showing info about in store_schema_partitions_record clearer --- sql/sql_show.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sql/sql_show.cc') diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 8f3c8236424..28daaa0336f 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3888,11 +3888,12 @@ static void collect_partition_expr(List &field_list, String *str) } -static void store_schema_partitions_record(THD *thd, TABLE *table, - TABLE *show_table, +static void store_schema_partitions_record(THD *thd, TABLE *schema_table, + TABLE *showing_table, partition_element *part_elem, handler *file, uint part_id) { + TABLE* table= schema_table; CHARSET_INFO *cs= system_charset_info; PARTITION_INFO stat_info; TIME time; @@ -3950,8 +3951,7 @@ static void store_schema_partitions_record(THD *thd, TABLE *table, strlen(part_elem->tablespace_name), cs); else { - DBUG_PRINT("info",("FOO")); - char *ts= show_table->file->get_tablespace_name(thd); + char *ts= showing_table->file->get_tablespace_name(thd); if(ts) table->field[24]->store(ts, strlen(ts), cs); else -- cgit v1.2.1