database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse Source 
into lmy004.:/work/mysql-5.1-tt-copy-works


sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2006-01-11 12:51:17 +01:00
parent b8ce8ad1d5 e44150128e
commit a66eafd671
5 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@ -3583,18 +3583,22 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
TIME time;
TABLE *show_table= tables->table;
handler *file= show_table->file;
#ifdef WITH_PARTITION_STORAGE_ENGINE
partition_info *part_info= show_table->part_info;
#endif
DBUG_ENTER("get_schema_partitions_record");
if (res)
{
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (part_info)
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
thd->net.last_errno, thd->net.last_error);
#endif
thd->clear_error();
DBUG_RETURN(0);
}
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (part_info)
{
partition_element *part_elem;
@ -3751,6 +3755,7 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables,
DBUG_RETURN(0);
}
else
#endif
{
store_schema_partitions_record(thd, table, 0, file, 0);
if(schema_table_store_record(thd, table))