database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Additional fix for wl#2506

Browse Source 
mysql-test/extra/binlog_tests/ctype_cp932.test:
    fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
    fixed test result
mysql-test/t/ctype_ucs.test:
    fixed test case
sql/sql_show.cc:
   Compilation with disabled partitioning is fixed
This commit is contained in:
unknown
2006-01-11 15:04:18 +04:00
parent 2c0f53d69c
commit 5df64b263c
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_show.cc
View File

@@ -3582,18 +3582,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;
@@ -3750,6 +3754,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))