Skip to content

Commit 3d0d290

Browse files
author
Jan Lindström
committed
Remove tablespace code from InnoDB compilation as it is not used.
1 parent 674e338 commit 3d0d290

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

storage/innobase/handler/ha_innodb.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12854,6 +12854,7 @@ create_table_info_t::create_option_data_directory_is_valid()
1285412854
}
1285512855

1285612856

12857+
#ifdef MYSQL_TABLESPACES
1285712858
#define IDENT_NAME_OK 0
1285812859
static int check_tablespace_name(const char *name)
1285912860
{
@@ -13046,6 +13047,7 @@ create_table_info_t::create_option_tablespace_is_valid()
1304613047

1304713048
return(true);
1304813049
}
13050+
#endif
1304913051

1305013052
#ifdef MYSQL_COMPRESSION
1305113053
/** Validate the COPMRESSION option.
@@ -13136,13 +13138,15 @@ create_table_info_t::create_options_are_invalid()
1313613138
ut_ad(m_thd != NULL);
1313713139
ut_ad(m_create_info != NULL);
1313813140

13141+
#ifdef MYSQL_TABLESPACES
1313913142
/* The TABLESPACE designation on a CREATE TABLE is not subject to
1314013143
non-strict-mode. If it is incorrect or is incompatible with other
1314113144
options, then we will return an error. Make sure the tablespace exists
1314213145
and is compatible with this table */
1314313146
if (!create_option_tablespace_is_valid()) {
1314413147
return("TABLESPACE");
1314513148
}
13149+
#endif
1314613150

1314713151
/* If innodb_strict_mode is not set don't do any more validation.
1314813152
Also, if this table is being put into a shared general tablespace

0 commit comments

Comments
 (0)