database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

fix compilation w/o partitioning

Browse Source
This commit is contained in:
Sergei Golubchik
2021-05-19 14:21:32 +02:00
parent f44c5e5eb9
commit b2340cdd07
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/handler.cc
View File

@ -1009,7 +1009,9 @@ void handler::log_not_redoable_operation(const char *operation)
We can't use partition_engine() here as this function is called We can't use partition_engine() here as this function is called
directly by the handler for the underlaying partition table directly by the handler for the underlaying partition table
*/ */
#ifdef WITH_PARTITION_STORAGE_ENGINE
ddl_log.org_partitioned= table->s->partition_info_str != 0; ddl_log.org_partitioned= table->s->partition_info_str != 0;
#endif
lex_string_set(&ddl_log.org_storage_engine_name, table_type()); lex_string_set(&ddl_log.org_storage_engine_name, table_type());
ddl_log.org_database= table->s->db; ddl_log.org_database= table->s->db;
ddl_log.org_table= table->s->table_name; ddl_log.org_table= table->s->table_name;
@ -5904,6 +5906,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
if (!hton) if (!hton)
hton= &dummy; hton= &dummy;
*hton= element->share->db_type(); *hton= element->share->db_type();
#ifdef WITH_PARTITION_STORAGE_ENGINE
if (partition_engine_name && element->share->db_type() == partition_hton) if (partition_engine_name && element->share->db_type() == partition_hton)
{ {
if (!static_cast<Partition_share *>(element->share->ha_share)-> if (!static_cast<Partition_share *>(element->share->ha_share)->
@ -5917,6 +5920,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
static_cast<Partition_share *>(element->share->ha_share)-> static_cast<Partition_share *>(element->share->ha_share)->
partition_engine_name); partition_engine_name);
} }
#endif
*is_sequence= element->share->table_type == TABLE_TYPE_SEQUENCE; *is_sequence= element->share->table_type == TABLE_TYPE_SEQUENCE;
if (*hton != view_pseudo_hton && element->share->tabledef_version.length && if (*hton != view_pseudo_hton && element->share->tabledef_version.length &&
table_id && table_id &&
@ -5927,7 +5931,7 @@ bool ha_table_exists(THD *thd, const LEX_CSTRING *db,
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }
retry_from_frm: retry_from_frm: __attribute__((unused));
char path[FN_REFLEN + 1]; char path[FN_REFLEN + 1];
size_t path_len = build_table_filename(path, sizeof(path) - 1, size_t path_len = build_table_filename(path, sizeof(path) - 1,
db->str, table_name->str, "", 0); db->str, table_name->str, "", 0);