database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11

Browse Source 
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.
This commit is contained in:
stewart@willster.(none)
2006-10-17 01:02:12 +10:00
parent c1a8b8daa7
commit 49124e987c
2 changed files with 80 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_show.cc
View File

@ -3888,11 +3888,12 @@ static void collect_partition_expr(List<char> &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