Commit 89f14570 authored by unknown's avatar unknown

Bug#16591 Partitions: crash using information_schema.partitions

Bug#16695 Reading I_S.PARTITIONS with pre-5.1.6 partitioned tables crashes server
 issue a warning in case of error during table opening

parent 7384eddb
...@@ -3583,23 +3583,23 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables, ...@@ -3583,23 +3583,23 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
String tmp_str; String tmp_str;
TIME time; TIME time;
TABLE *show_table= tables->table; TABLE *show_table= tables->table;
handler *file= show_table->file; handler *file;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *part_info= show_table->part_info; partition_info *part_info;
#endif #endif
DBUG_ENTER("get_schema_partitions_record"); DBUG_ENTER("get_schema_partitions_record");
if (res) if (res)
{ {
#ifdef WITH_PARTITION_STORAGE_ENGINE if (!tables->view)
if (part_info)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
thd->net.last_errno, thd->net.last_error); thd->net.last_errno, thd->net.last_error);
#endif
thd->clear_error(); thd->clear_error();
DBUG_RETURN(0); DBUG_RETURN(0);
} }
file= show_table->file;
#ifdef WITH_PARTITION_STORAGE_ENGINE #ifdef WITH_PARTITION_STORAGE_ENGINE
part_info= show_table->part_info;
if (part_info) if (part_info)
{ {
partition_element *part_elem; partition_element *part_elem;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment