database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

GCC8.5 warning fixed

Browse Source
This commit is contained in:
Leonid Fedorov
2025-07-15 16:41:31 +00:00
committed by Leonid Fedorov
parent 11e0492561
commit 902805d5a3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/mysql/ha_mcs.cpp
View File

@@ -1828,7 +1828,7 @@ static int columnstore_init_func(void* p)
fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(), fprintf(stderr, "Columnstore: Started; Version: %s-%s\n", columnstore_version.c_str(),
columnstore_release.c_str()); columnstore_release.c_str());
plugin_ref plugin_innodb; plugin_ref plugin_innodb = nullptr;
LEX_CSTRING name = {STRING_WITH_LEN("INNODB")}; LEX_CSTRING name = {STRING_WITH_LEN("INNODB")};
if (get_innodb_queries_uses_mcs()) if (get_innodb_queries_uses_mcs())
@@ -1841,7 +1841,7 @@ static int columnstore_init_func(void* p)
DBUG_RETURN(HA_ERR_RETRY_INIT); DBUG_RETURN(HA_ERR_RETRY_INIT);
} }
} }
strncpy(cs_version, columnstore_version.c_str(), sizeof(cs_version) - 1); strncpy(cs_version, columnstore_version.c_str(), sizeof(cs_version) - 1);
cs_version[sizeof(cs_version) - 1] = 0; cs_version[sizeof(cs_version) - 1] = 0;
@@ -1857,7 +1857,7 @@ static int columnstore_init_func(void* p)
(my_hash_get_key)mcs_get_key, 0, 0); (my_hash_get_key)mcs_get_key, 0, 0);
std::cerr << "Columnstore: init mcs_hton attributes" << std::endl; std::cerr << "Columnstore: init mcs_hton attributes" << std::endl;
mcs_hton->create = ha_mcs_cache_create_handler; mcs_hton->create = ha_mcs_cache_create_handler;
mcs_hton->panic = 0; mcs_hton->panic = 0;
mcs_hton->flags = HTON_CAN_RECREATE | HTON_NO_PARTITION; mcs_hton->flags = HTON_CAN_RECREATE | HTON_NO_PARTITION;
@@ -1873,13 +1873,15 @@ static int columnstore_init_func(void* p)
if (get_innodb_queries_uses_mcs()) if (get_innodb_queries_uses_mcs())
{ {
std::cerr << "Columnstore: innodb_queries_uses_mcs is set, redirecting all InnoDB queries to Columnstore." << std::endl; std::cerr << "Columnstore: innodb_queries_uses_mcs is set, redirecting all InnoDB queries to Columnstore."
<< std::endl;
auto* innodb_hton = plugin_hton(plugin_innodb); auto* innodb_hton = plugin_hton(plugin_innodb);
int error = innodb_hton == nullptr; // Engine must exists! int error = innodb_hton == nullptr; // Engine must exists!
if (error) if (error)
{ {
std::cerr << "Columnstore: innodb_queries_uses_mcs is set, but could not find InnoDB plugin." << std::endl; std::cerr << "Columnstore: innodb_queries_uses_mcs is set, but could not find InnoDB plugin."
<< std::endl;
my_error(HA_ERR_INITIALIZATION, MYF(0), "Could not find storage engine %s", name.str); my_error(HA_ERR_INITIALIZATION, MYF(0), "Could not find storage engine %s", name.str);
} }
innodb_hton->create_select = create_columnstore_select_handler; innodb_hton->create_select = create_columnstore_select_handler;