VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-23 00:55:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

typos in comments, etc

Browse Source
This commit is contained in:
Sergei Golubchik
2023-01-03 20:48:03 +01:00
committed by Monty
parent 5e5988dbb8
commit 7e465aeb3a
5 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/optimizer_costs.txt
View File

@ -1,5 +1,5 @@
This file is intended to explain some of the optimizer cost variables
in MariaDB 10.11.
in MariaDB 11.0
Background
==========

0
mysql-test/main/optimizer_costs2-master.opt → mysql-test/main/optimizer_costs2.opt
View File

0
mysql-test/main/subselect_mat_cost-master.opt → mysql-test/main/subselect_mat_cost.opt
View File

4
sql/handler.cc
View File

@ -763,9 +763,7 @@ int ha_initialize_handlerton(st_plugin_int *plugin)
savepoint_alloc_size+= tmp;
hton2plugin[hton->slot]=plugin;
if (plugin->plugin->type == MYSQL_STORAGE_ENGINE_PLUGIN &&
!(hton->flags & HTON_HIDDEN) &&
update_optimizer_costs(hton))
if (!(hton->flags & HTON_HIDDEN) && update_optimizer_costs(hton))
goto err_deinit;
if (hton->prepare)

6
sql/sys_vars.inl
View File

@ -1200,7 +1200,6 @@ public:
option.var_type|= GET_DOUBLE;
option.min_value= (longlong) getopt_double2ulonglong(min_val);
option.max_value= (longlong) getopt_double2ulonglong(max_val);
global_var(double)= (double)option.def_value;
SYSVAR_ASSERT(min_val < max_val);
SYSVAR_ASSERT(min_val <= def_val);
SYSVAR_ASSERT(max_val >= def_val);
@ -1263,7 +1262,6 @@ public:
option.var_type|= GET_ADJUST_VALUE;
}
cost_adjust= (double) arg_cost_adjust;
global_var(double)= (double)option.def_value/cost_adjust; // To usec
}
bool session_update(THD *thd, set_var *var)
{
@ -1287,7 +1285,7 @@ public:
/*
The class for optimzer costs with structured names, unique for each engine.
The class for optimizer costs with structured names, unique for each engine.
Used as 'engine.variable_name'
Class specific constructor arguments:
@ -1331,7 +1329,7 @@ class Sys_var_engine_optimizer_cost: public Sys_var_optimizer_cost
{
option.var_type|= GET_ASK_ADDR;
option.value= (uchar**)1; // crash me, please
// fix an offset from global_system_variables to be an offset in KEY_CACHE
// fix an offset from global_system_variables to be an offset in OPTIMIZER_COSTS
offset= global_var_ptr() - (uchar*) &default_optimizer_costs;
SYSVAR_ASSERT(scope() == GLOBAL);
}