database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-03 14:33:32 +03:00
Code Activity

wl#2936 - fixing problems

Browse Source
This commit is contained in:
serg@janus.mylan
2007-04-13 19:23:02 +02:00
parent 48f3ec8570
commit 3ecbb5a443
20 changed files with 369 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/mysql-test-run.pl
View File

@@ -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
{

2
mysql-test/r/flush2.result
View File

@@ -5,6 +5,7 @@ Variable_name Value
log ON
log_bin OFF
log_bin_trust_function_creators ON
log_bin_trust_routine_creators ON
log_error
log_output TABLE
log_queries_not_using_indexes OFF
@@ -17,6 +18,7 @@ Variable_name Value
log ON
log_bin OFF
log_bin_trust_function_creators ON
log_bin_trust_routine_creators ON
log_error
log_output TABLE
log_queries_not_using_indexes OFF

8
mysql-test/r/im_utils.result
View File

@@ -20,8 +20,8 @@ character-sets-dir VALUE
basedir VALUE
server_id VALUE
skip-stack-trace VALUE
skip-plugin-innodb VALUE
skip-plugin-ndbcluster VALUE
loose-skip-innodb VALUE
loose-skip-ndbcluster VALUE
log-output VALUE
SHOW INSTANCE OPTIONS mysqld2;
option_name value
@@ -38,8 +38,8 @@ character-sets-dir VALUE
basedir VALUE
server_id VALUE
skip-stack-trace VALUE
skip-plugin-innodb VALUE
skip-plugin-ndbcluster VALUE
loose-skip-innodb VALUE
loose-skip-ndbcluster VALUE
nonguarded VALUE
log-output VALUE
START INSTANCE mysqld2;