Skip to content

Commit a1ec4fc

Browse files
committed
Added code change.
1 parent a3639ca commit a1ec4fc

1 file changed

Lines changed: 7 additions & 10 deletions

File tree

storage/innobase/handler/ha_innodb.cc

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11058,16 +11058,13 @@ create_table_info_t::create_option_data_directory_is_valid()
1105811058
/* Do not use DATA DIRECTORY with TEMPORARY TABLE or
1105911059
GLOBAL TEMPORARY TABLE. */
1106011060
if (m_create_info->tmp_table() || m_create_info->global_tmp_table()) {
11061-
const char *msg = m_create_info->global_tmp_table()
11062-
? "InnoDB: DATA DIRECTORY cannot be used for"
11063-
" GLOBAL TEMPORARY tables."
11064-
: "InnoDB: DATA DIRECTORY cannot be used for"
11065-
" TEMPORARY tables.";
11066-
push_warning(
11067-
m_thd, Sql_condition::WARN_LEVEL_WARN,
11068-
ER_ILLEGAL_HA_CREATE_OPTION, msg);
11069-
is_valid = false;
11070-
}
11061+
push_warning_printf(
11062+
m_thd, Sql_condition::WARN_LEVEL_WARN,
11063+
ER_ILLEGAL_HA_CREATE_OPTION,
11064+
"InnoDB: DATA DIRECTORY cannot be used for %s tables.",
11065+
m_create_info->global_tmp_table() ? "GLOBAL TEMPORARY" : "TEMPORARY");
11066+
is_valid = false;
11067+
}
1107111068

1107211069
/* We check for a DATA DIRECTORY mixed with TABLESPACE in
1107311070
create_option_tablespace_is_valid(), no need to here. */

0 commit comments

Comments
 (0)