@@ -152,12 +152,6 @@ innodb_check_deprecated(void);
152
152
#include <string>
153
153
#include <sstream>
154
154
155
- /* for ha_innopart, Native InnoDB Partitioning. */
156
- /* JAN: TODO: MySQL 5.7 Native InnoDB Partitioning */
157
- #ifdef HAVE_HA_INNOPART_H
158
- #include "ha_innopart.h"
159
- #endif
160
-
161
155
#include <mysql/plugin.h>
162
156
#include <mysql/service_wsrep.h>
163
157
@@ -1360,16 +1354,6 @@ innobase_release_savepoint(
1360
1354
1361
1355
static void innobase_checkpoint_request(handlerton *hton, void *cookie);
1362
1356
1363
- /************************************************************************//**
1364
- Function for constructing an InnoDB table handler instance. */
1365
- static
1366
- handler*
1367
- innobase_create_handler(
1368
- /*====================*/
1369
- handlerton* hton, /*!< in/out: handlerton for InnoDB */
1370
- TABLE_SHARE* table,
1371
- MEM_ROOT* mem_root);
1372
-
1373
1357
/** @brief Initialize the default value of innodb_commit_concurrency.
1374
1358
1375
1359
Once InnoDB is running, the innodb_commit_concurrency must not change
@@ -1636,26 +1620,6 @@ innobase_create_handler(
1636
1620
TABLE_SHARE* table,
1637
1621
MEM_ROOT* mem_root)
1638
1622
{
1639
- #ifdef MYSQL_INNODB_PARTITIONING
1640
- /* If the table:
1641
- 1) have type InnoDB (not the generic partition handlerton)
1642
- 2) have partitioning defined
1643
- Then return the native partitioning handler ha_innopart
1644
- else return normal ha_innobase handler. */
1645
- if (table
1646
- && table->db_type() == innodb_hton_ptr // 1)
1647
- && table->partition_info_str // 2)
1648
- && table->partition_info_str_len) { // 2)
1649
- ha_innopart* file = new (mem_root) ha_innopart(hton, table);
1650
- if (file && file->init_partitioning(mem_root))
1651
- {
1652
- delete file;
1653
- return(NULL);
1654
- }
1655
- return(file);
1656
- }
1657
- #endif
1658
-
1659
1623
return(new (mem_root) ha_innobase(hton, table));
1660
1624
}
1661
1625
@@ -5502,19 +5466,6 @@ ha_innobase::table_flags() const
5502
5466
THD* thd = ha_thd();
5503
5467
handler::Table_flags flags = m_int_table_flags;
5504
5468
5505
- /* If querying the table flags when no table_share is given,
5506
- then we must check if the table to be created/checked is partitioned.
5507
- */
5508
- if (table_share == NULL) {
5509
- /* JAN: TODO: MySQL 5.7 Partitioning && thd_get_work_part_info(thd) != NULL) { */
5510
- /* Currently ha_innopart does not support
5511
- all InnoDB features such as GEOMETRY, FULLTEXT etc. */
5512
- /* JAN: TODO: MySQL 5.7
5513
- flags &= ~(HA_INNOPART_DISABLED_TABLE_FLAGS);
5514
- }
5515
- */
5516
- }
5517
-
5518
5469
/* Need to use tx_isolation here since table flags is (also)
5519
5470
called before prebuilt is inited. */
5520
5471
0 commit comments