mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
wl#2936 - fixing problems
include/mysql/plugin.h: warning. no int/realsize mysys/my_getopt.c: combination of prefixes (e.g. --loose-skip-) didn't work sql/event_queue.cc: warning sql/handler.cc: assert sql/handler.h: comment sql/item_create.cc: warnings sql/log.cc: warnings sql/mysqld.cc: wl#2936 - fixing problems (memory leak in load_defaults, garbage in opt_[slow_]logname sql/partition_element.h: warnings sql/rpl_utility.h: warnings sql/set_var.cc: comment sql/set_var.h: warnings sql/sql_class.cc: warnings sql/sql_parse.cc: warnings sql/sql_plugin.cc: wl#2936 - fixing problems: portability, coding style, reporting of spurious errors, crashes, incorrect help output storage/example/ha_example.cc: comment storage/innobase/handler/ha_innodb.cc: wl#2936 - fixing problems (crash)
This commit is contained in:
@ -2930,8 +2930,8 @@ sub install_db ($$) {
|
||||
mtr_add_arg($args, "--skip-grant-tables");
|
||||
mtr_add_arg($args, "--basedir=%s", $path_my_basedir);
|
||||
mtr_add_arg($args, "--datadir=%s", $data_dir);
|
||||
mtr_add_arg($args, "--skip-innodb");
|
||||
mtr_add_arg($args, "--skip-ndbcluster");
|
||||
mtr_add_arg($args, "--loose-skip-innodb");
|
||||
mtr_add_arg($args, "--loose-skip-ndbcluster");
|
||||
mtr_add_arg($args, "--tmpdir=.");
|
||||
mtr_add_arg($args, "--core-file");
|
||||
|
||||
@ -3037,8 +3037,8 @@ character-sets-dir = $path_charsetsdir
|
||||
basedir = $path_my_basedir
|
||||
server_id = $server_id
|
||||
skip-stack-trace
|
||||
skip-innodb
|
||||
skip-ndbcluster
|
||||
loose-skip-innodb
|
||||
loose-skip-ndbcluster
|
||||
EOF
|
||||
;
|
||||
if ( $mysql_version_id < 50100 )
|
||||
@ -3676,7 +3676,7 @@ sub mysqld_arguments ($$$$$) {
|
||||
if ( $opt_skip_ndbcluster ||
|
||||
!$cluster->{'pid'})
|
||||
{
|
||||
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
|
||||
mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -3731,7 +3731,7 @@ sub mysqld_arguments ($$$$$) {
|
||||
$slave->[$idx]->{'port'});
|
||||
mtr_add_arg($args, "%s--report-user=root", $prefix);
|
||||
mtr_add_arg($args, "%s--skip-innodb", $prefix);
|
||||
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
|
||||
mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix);
|
||||
mtr_add_arg($args, "%s--skip-slave-start", $prefix);
|
||||
|
||||
# Directory where slaves find the dumps generated by "load data"
|
||||
@ -3767,7 +3767,7 @@ sub mysqld_arguments ($$$$$) {
|
||||
$slave->[$idx]->{'cluster'} == -1 ||
|
||||
!$clusters->[$slave->[$idx]->{'cluster'}]->{'pid'} )
|
||||
{
|
||||
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
|
||||
mtr_add_arg($args, "%s--loose-skip-ndbcluster", $prefix);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user