Commit e6d918ca authored by Sergei Golubchik's avatar Sergei Golubchik

init_status_vars() was not invoked for embedded

which failed main.features test in embedded, because
status variables were not sorted
parent 91f8931e
...@@ -5013,6 +5013,7 @@ static int init_server_components() ...@@ -5013,6 +5013,7 @@ static int init_server_components()
init_global_client_stats(); init_global_client_stats();
if (!opt_bootstrap) if (!opt_bootstrap)
servers_init(0); servers_init(0);
init_status_vars();
DBUG_RETURN(0); DBUG_RETURN(0);
} }
...@@ -5461,7 +5462,6 @@ int mysqld_main(int argc, char **argv) ...@@ -5461,7 +5462,6 @@ int mysqld_main(int argc, char **argv)
#endif #endif
} }
init_status_vars();
if (opt_bootstrap) /* If running with bootstrap, do not start replication. */ if (opt_bootstrap) /* If running with bootstrap, do not start replication. */
opt_skip_slave_start= 1; opt_skip_slave_start= 1;
......
...@@ -2895,7 +2895,7 @@ void reset_status_vars() ...@@ -2895,7 +2895,7 @@ void reset_status_vars()
catch-all cleanup function, cleans up everything no matter what catch-all cleanup function, cleans up everything no matter what
DESCRIPTION DESCRIPTION
This function is not strictly required if all add_to_status/ This function is not strictly required if all add_status_vars/
remove_status_vars are properly paired, but it's a safety measure that remove_status_vars are properly paired, but it's a safety measure that
deletes everything from the all_status_vars[] even if some deletes everything from the all_status_vars[] even if some
remove_status_vars were forgotten remove_status_vars were forgotten
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment