-
Andrei Elkin authored
The test reacted on the way how mtr orders arguments for the server that are gathered from different source. It appeared that the opt-file options were parsed before those that supplied to mtr via its command line. In effect, the opt-file preferences got overriden by the command line and some tests, like no-threads, were caught by surprise: a test expects an option value that had been "hardcoded" into its opt-file but gets another one. This server options ordering problem exists on in the new rpl trees mtr. In option of the author of this patch, the opt-file shall be considered as having the highest preference weight. The opt-file is merely a part of the header of a test, namely a part that can not be technically deployed along the test file. It's unnatural for the test writer to provide both the opt file value and a guard that guarantees the value will be set on in the run time. It's logical to provide either one: the option and its value or the guard. Fixed with relocating parse of the opt file to be the last among sources of the sever's options. A side effect: fixing a small problem of resetting the suite options at time the opt file starts parsing. A side effect: main.log_bin_trust_function_creators_func is disabled to be re-enabled with the fixes for bug#41003 will be merged from the main trees. mysql-test/lib/mtr_cases.pm: Relocating parse of the opt file to be the last. This ensure the opt file is the last provider for the server options so that the opt-file options have the highest preference; fixing a separate issue of incorrect resetting the suite options for the server; mysql-test/t/disabled.def: log_bin_trust_function_creators_func is disabled. Todo: to-reable when fixes for bug#41003 will be merged from the main trees.
fab8d1b4