1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove remaining InnoDB references to the TABLESPACE keyword

Browse Source 
MySQL 5.7 allows the creation of InnoDB tables in a user-created
tablespace, but MariaDB does not. Remove the remaining references.

This is a non-functional change.
This commit is contained in:
Marko Mäkelä 2017-10-02 10:03:47 +03:00
parent 157d130a87
commit 76953c0e45
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/innobase/handler/ha_innodb.cc
View File

@ -49,9 +49,6 @@ this program; if not, write to the Free Software Foundation, Inc.,
#include <sql_class.h> #include <sql_class.h>
#include <sql_show.h> #include <sql_show.h>
#include <sql_table.h> #include <sql_table.h>
#include <sql_tablespace.h>
// MySQL 5.7 Header */
// #include <sql_thd_internal_api.h>
#include <table_cache.h> #include <table_cache.h>
#include <my_check_opt.h> #include <my_check_opt.h>
#include <my_bitmap.h> #include <my_bitmap.h>

8
storage/innobase/handler/handler0alter.cc
View File

@ -409,12 +409,10 @@ innobase_need_rebuild(
== Alter_inplace_info::CHANGE_CREATE_OPTION == Alter_inplace_info::CHANGE_CREATE_OPTION
&& !(ha_alter_info->create_info->used_fields && !(ha_alter_info->create_info->used_fields
& (HA_CREATE_USED_ROW_FORMAT & (HA_CREATE_USED_ROW_FORMAT
| HA_CREATE_USED_KEY_BLOCK_SIZE))) { | HA_CREATE_USED_KEY_BLOCK_SIZE))) {
// JAN: TODO: MySQL 5.7
// | HA_CREATE_USED_TABLESPACE))) {
/* Any other CHANGE_CREATE_OPTION than changing /* Any other CHANGE_CREATE_OPTION than changing
ROW_FORMAT, KEY_BLOCK_SIZE or TABLESPACE can be done ROW_FORMAT or KEY_BLOCK_SIZE can be done without
without rebuilding the table. */ rebuilding the table. */
return(false); return(false);
} }