diff options
| author | unknown <andrey@lmy004.> | 2006-01-11 12:51:17 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-11 12:51:17 +0100 |
| commit | a66eafd6710693f52d635b04b71c84426763a22c (patch) | |
| tree | a2b6b04141c0a9bcc9bfb66bae589c3c60870147 /sql/sql_show.cc | |
| parent | b8ce8ad1d5168371bde4c4d3de2a22d3c725a57f (diff) | |
| parent | e44150128e82ae3fa022273ac91c251f7c39091b (diff) | |
| download | mariadb-git-a66eafd6710693f52d635b04b71c84426763a22c.tar.gz | |
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-tt-copy-works
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 9af37947bb0..370ec0e77b5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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)) |