Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
17b73fb9
Commit
17b73fb9
authored
Dec 31, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the accessor HA_CREATE_INFO::tmp_table()
parent
3bdd93c1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
11 deletions
+7
-11
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.cc
+7
-11
No files found.
storage/innobase/handler/ha_innodb.cc
View file @
17b73fb9
...
@@ -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. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment