database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.6' into 10.11

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-03 09:15:40 +02:00
parent 9ab37940dd 8f020508c8
commit 0e8fb977b0
40 changed files with 1270 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.cc
View File

@@ -5358,6 +5358,17 @@ extern "C" int thd_current_status(MYSQL_THD thd)
}
extern "C" int thd_double_innodb_cardinality(MYSQL_THD thd)
{
/*
The original behavior was to double the cardinality.
OPTIMIZER_FIX_INNODB_CARDINALITY means do not double.
*/
return !(thd->variables.optimizer_adjust_secondary_key_costs &
OPTIMIZER_FIX_INNODB_CARDINALITY);
}
extern "C" enum enum_server_command thd_current_command(MYSQL_THD thd)
{
return thd->get_command();