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

MDEV-34269: post-fix code simplification

Browse Source 
The code is slightly simplified taking into account
the fact that partition_ht() always returns a normal
hton when there is no partitioning.
This commit is contained in:
Julius Goryavsky 2024-06-07 14:53:11 +02:00
parent 0172887980
commit 0d85c905c4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_load.cc
View File

@ -117,10 +117,8 @@ public:
*/ */
if (WSREP(thd) && wsrep_load_data_splitting) if (WSREP(thd) && wsrep_load_data_splitting)
{ {
handlerton *ht= table->s->db_type();
// For partitioned tables find underlying hton // For partitioned tables find underlying hton
if (table->file->partition_ht()) handlerton *ht= table->file->partition_ht();
ht= table->file->partition_ht();
if (ht->db_type != DB_TYPE_INNODB) if (ht->db_type != DB_TYPE_INNODB)
{ {
push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,

4
sql/sql_parse.cc
View File

@ -4747,9 +4747,7 @@ mysql_execute_command(THD *thd)
#ifdef WITH_WSREP #ifdef WITH_WSREP
if (wsrep && !first_table->view) if (wsrep && !first_table->view)
{ {
const handlerton *hton = first_table->table->file->partition_ht() ? bool is_innodb= first_table->table->file->partition_ht()->db_type == DB_TYPE_INNODB;
first_table->table->file->partition_ht() : first_table->table->file->ht;
bool is_innodb= (hton->db_type == DB_TYPE_INNODB);
// For consistency check inserted table needs to be InnoDB // For consistency check inserted table needs to be InnoDB
if (!is_innodb && thd->wsrep_consistency_check != NO_CONSISTENCY_CHECK) if (!is_innodb && thd->wsrep_consistency_check != NO_CONSISTENCY_CHECK)