mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 17:33:44 +01:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
This commit is contained in:
commit
81507408e2
1 changed files with 5 additions and 5 deletions
|
@ -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;
|
||||||
|
|
Loading…
Add table
Reference in a new issue