database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Vladislav Vaintroub
2010-01-13 21:14:42 +01:00
parent f3460b2132 51caeae915
commit b84abb3c40
39 changed files with 515 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/mysqld.cc
View File

@ -7384,6 +7384,18 @@ mysqld_get_one_option(int optid,
}
break;
#endif /* defined(ENABLED_DEBUG_SYNC) */
case OPT_ENGINE_CONDITION_PUSHDOWN:
/*
The last of --engine-condition-pushdown and --optimizer_switch on
command line wins (see get_options().
*/
if (global_system_variables.engine_condition_pushdown)
global_system_variables.optimizer_switch|=
OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN;
else
global_system_variables.optimizer_switch&=
~OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN;
break;
}
return 0;
}
@ -7610,6 +7622,11 @@ static int get_options(int *argc_ptr, char ***argv_ptr)
else
pool_of_threads_scheduler(&thread_scheduler); /* purecov: tested */
#endif
global_system_variables.engine_condition_pushdown=
test(global_system_variables.optimizer_switch &
OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN);
return 0;
}