Commit 17b73fb9 authored by Marko Mäkelä's avatar Marko Mäkelä

Use the accessor HA_CREATE_INFO::tmp_table()

parent 3bdd93c1
...@@ -11313,7 +11313,7 @@ create_table_info_t::create_option_data_directory_is_valid() ...@@ -11313,7 +11313,7 @@ create_table_info_t::create_option_data_directory_is_valid()
} }
/* Do not use DATA DIRECTORY with TEMPORARY TABLE. */ /* Do not use DATA DIRECTORY with TEMPORARY TABLE. */
if (m_create_info->options & HA_LEX_CREATE_TMP_TABLE) { if (m_create_info->tmp_table()) {
push_warning( push_warning(
m_thd, Sql_condition::WARN_LEVEL_WARN, m_thd, Sql_condition::WARN_LEVEL_WARN,
ER_ILLEGAL_HA_CREATE_OPTION, ER_ILLEGAL_HA_CREATE_OPTION,
...@@ -11342,8 +11342,7 @@ create_table_info_t::create_options_are_invalid() ...@@ -11342,8 +11342,7 @@ create_table_info_t::create_options_are_invalid()
const char* ret = NULL; const char* ret = NULL;
enum row_type row_format = m_create_info->row_type; enum row_type row_format = m_create_info->row_type;
const bool is_temp const bool is_temp = m_create_info->tmp_table();
= m_create_info->options & HA_LEX_CREATE_TMP_TABLE;
ut_ad(m_thd != NULL); ut_ad(m_thd != NULL);
...@@ -11709,7 +11708,7 @@ create_table_info_t::parse_table_name( ...@@ -11709,7 +11708,7 @@ create_table_info_t::parse_table_name(
if (m_innodb_file_per_table if (m_innodb_file_per_table
&& !mysqld_embedded && !mysqld_embedded
&& !(m_create_info->options & HA_LEX_CREATE_TMP_TABLE)) { && !m_create_info->tmp_table()) {
if ((name[1] == ':') if ((name[1] == ':')
|| (name[0] == '\\' && name[1] == '\\')) { || (name[0] == '\\' && name[1] == '\\')) {
...@@ -11764,10 +11763,8 @@ bool create_table_info_t::innobase_table_flags() ...@@ -11764,10 +11763,8 @@ bool create_table_info_t::innobase_table_flags()
enum row_type row_type; enum row_type row_type;
rec_format_t innodb_row_format = rec_format_t innodb_row_format =
get_row_format(m_default_row_format); get_row_format(m_default_row_format);
const bool is_temp const bool is_temp = m_create_info->tmp_table();
= m_create_info->options & HA_LEX_CREATE_TMP_TABLE; bool zip_allowed = !is_temp;
bool zip_allowed
= !is_temp;
const ulint zip_ssize_max = const ulint zip_ssize_max =
ut_min(static_cast<ulint>(UNIV_PAGE_SSIZE_MAX), ut_min(static_cast<ulint>(UNIV_PAGE_SSIZE_MAX),
...@@ -12167,9 +12164,8 @@ create_table_info_t::set_tablespace_type( ...@@ -12167,9 +12164,8 @@ create_table_info_t::set_tablespace_type(
/* Ignore the current innodb-file-per-table setting if we are /* Ignore the current innodb-file-per-table setting if we are
creating a temporary table. */ creating a temporary table. */
m_use_file_per_table = m_use_file_per_table = m_allow_file_per_table
m_allow_file_per_table && !m_create_info->tmp_table();
&& !(m_create_info->options & HA_LEX_CREATE_TMP_TABLE);
/* DATA DIRECTORY must have m_use_file_per_table but cannot be /* DATA DIRECTORY must have m_use_file_per_table but cannot be
used with TEMPORARY tables. */ used with TEMPORARY tables. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment