Skip to content

Commit e63f621

Browse files
committed
Remove references to MySQL 5.7 native InnoDB partitioning
The native InnoDB partitioning was never enabled in MariaDB. Remove some declarations and comments referring to it.
1 parent 5630487 commit e63f621

File tree

5 files changed

+2
-27
lines changed

5 files changed

+2
-27
lines changed

storage/innobase/handler/ha_innodb.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2990,7 +2990,6 @@ ha_innobase::ha_innobase(
29902990
TABLE_SHARE* table_arg)
29912991
:handler(hton, table_arg),
29922992
m_prebuilt(),
2993-
m_prebuilt_ptr(&m_prebuilt),
29942993
m_user_thd(),
29952994
m_int_table_flags(HA_REC_NOT_IN_SEQ
29962995
| HA_NULL_IN_KEY
@@ -3656,9 +3655,6 @@ innobase_init_abort()
36563655
/** Return partitioning flags. */
36573656
static uint innobase_partition_flags()
36583657
{
3659-
/* JAN: TODO: MYSQL 5.7
3660-
return(HA_CAN_EXCHANGE_PARTITION | HA_CANNOT_PARTITION_FK);
3661-
*/
36623658
return (0);
36633659
}
36643660

@@ -13238,8 +13234,6 @@ inline int ha_innobase::delete_table(const char* name, enum_sql_command sqlcom)
1323813234
}
1323913235
}
1324013236

13241-
/* TODO: remove this when the conversion tool from ha_partition to
13242-
native innodb partitioning is completed */
1324313237
if (err == DB_TABLE_NOT_FOUND
1324413238
&& innobase_get_lower_case_table_names() == 1) {
1324513239
char* is_part = is_partition(norm_name);

storage/innobase/handler/ha_innodb.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -550,15 +550,6 @@ bool thd_is_strict_mode(const MYSQL_THD thd);
550550
*/
551551
extern void mysql_bin_log_commit_pos(THD *thd, ulonglong *out_pos, const char **out_file);
552552

553-
/** Get the partition_info working copy.
554-
@param thd Thread object.
555-
@return NULL or pointer to partition_info working copy. */
556-
/* JAN: TODO: MySQL 5.7 Partitioning
557-
partition_info*
558-
thd_get_work_part_info(
559-
THD* thd);
560-
*/
561-
562553
struct trx_t;
563554
#ifdef WITH_WSREP
564555
//extern "C" int wsrep_trx_order_before(void *thd1, void *thd2);

storage/innobase/handler/handler0alter.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -626,14 +626,6 @@ ha_innobase::check_if_supported_inplace_alter(
626626
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
627627
}
628628

629-
#if 0
630-
if (altered_table->file->ht != ht) {
631-
/* Non-native partitioning table engine. No longer supported,
632-
due to implementation of native InnoDB partitioning. */
633-
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
634-
}
635-
#endif
636-
637629
if (!(ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)) {
638630
DBUG_RETURN(HA_ALTER_INPLACE_NO_LOCK);
639631
}

storage/innobase/include/ut0new.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2017, 2018, MariaDB Corporation.
4+
Copyright (c) 2017, 2019, MariaDB Corporation.
55
66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -171,7 +171,6 @@ extern PSI_memory_key mem_key_row_log_buf;
171171
extern PSI_memory_key mem_key_row_merge_sort;
172172
extern PSI_memory_key mem_key_std;
173173
extern PSI_memory_key mem_key_trx_sys_t_rw_trx_ids;
174-
extern PSI_memory_key mem_key_partitioning;
175174

176175
/** Setup the internal objects needed for UT_NEW() to operate.
177176
This must be called before the first call to UT_NEW(). */

storage/innobase/ut/ut0new.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*****************************************************************************
22
33
Copyright (c) 2014, 2016, Oracle and/or its affiliates. All Rights Reserved.
4+
Copyright (c) 2019, MariaDB Corporation.
45
56
This program is free software; you can redistribute it and/or modify it under
67
the terms of the GNU General Public License as published by the Free Software
@@ -42,7 +43,6 @@ PSI_memory_key mem_key_row_log_buf;
4243
PSI_memory_key mem_key_row_merge_sort;
4344
PSI_memory_key mem_key_std;
4445
PSI_memory_key mem_key_trx_sys_t_rw_trx_ids;
45-
PSI_memory_key mem_key_partitioning;
4646

4747
#ifdef UNIV_PFS_MEMORY
4848

@@ -71,7 +71,6 @@ static PSI_memory_info pfs_info[] = {
7171
{&mem_key_row_merge_sort, "row_merge_sort", 0},
7272
{&mem_key_std, "std", 0},
7373
{&mem_key_trx_sys_t_rw_trx_ids, "trx_sys_t::rw_trx_ids", 0},
74-
{&mem_key_partitioning, "partitioning", 0},
7574
};
7675

7776
/** Map used for default performance schema keys, based on file name of the

0 commit comments

Comments
 (0)