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

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
This commit is contained in:
unknown
2005-06-25 02:01:34 +02:00
parent f6edb3f5c2 5491325c54
commit 1d937708e8
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -101,12 +101,12 @@ tags:
test: test:
cd mysql-test; \ cd mysql-test; \
perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol ./mysql-test-run && ./mysql-test-run --ps-protocol
test-force: test-force:
cd mysql-test; \ cd mysql-test; \
perl mysql-test-run.pl --force ;\ ./mysql-test-run --force ;\
perl mysql-test-run.pl --ps-protocol --force ./mysql-test-run --ps-protocol --force
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%

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

@ -1554,11 +1554,12 @@ sub do_before_start_master ($$) {
} }
} }
# FIXME only remove the ones that are tied to this master
# Remove old master.info and relay-log.info files # Remove old master.info and relay-log.info files
unlink("$opt_vardir/master-data/master.info"); unlink("$master->[0]->{'path_myddir'}/master.info");
unlink("$opt_vardir/master-data/relay-log.info"); unlink("$master->[0]->{'path_myddir'}/relay-log.info");
unlink("$opt_vardir/master1-data/master.info"); unlink("$master->[1]->{'path_myddir'}/master.info");
unlink("$opt_vardir/master1-data/relay-log.info"); unlink("$master->[1]->{'path_myddir'}/relay-log.info");
# Run master initialization shell script if one exists # Run master initialization shell script if one exists
if ( $init_script ) if ( $init_script )
@ -1652,12 +1653,15 @@ sub mysqld_arguments ($$$$$) {
if ( $type eq 'master' ) if ( $type eq 'master' )
{ {
mtr_add_arg($args, "%s--log-bin=%s/log/master-bin", $prefix, $opt_vardir); my $id= $idx > 0 ? $idx + 101 : 1;
mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
$opt_vardir, $sidx);
mtr_add_arg($args, "%s--pid-file=%s", $prefix, mtr_add_arg($args, "%s--pid-file=%s", $prefix,
$master->[$idx]->{'path_mypid'}); $master->[$idx]->{'path_mypid'});
mtr_add_arg($args, "%s--port=%d", $prefix, mtr_add_arg($args, "%s--port=%d", $prefix,
$master->[$idx]->{'path_myport'}); $master->[$idx]->{'path_myport'});
mtr_add_arg($args, "%s--server-id=1", $prefix); mtr_add_arg($args, "%s--server-id=%d", $prefix, $id);
mtr_add_arg($args, "%s--socket=%s", $prefix, mtr_add_arg($args, "%s--socket=%s", $prefix,
$master->[$idx]->{'path_mysock'}); $master->[$idx]->{'path_mysock'});
mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:128M:autoextend", $prefix); mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:128M:autoextend", $prefix);
@ -1665,6 +1669,11 @@ sub mysqld_arguments ($$$$$) {
mtr_add_arg($args, "%s--datadir=%s", $prefix, mtr_add_arg($args, "%s--datadir=%s", $prefix,
$master->[$idx]->{'path_myddir'}); $master->[$idx]->{'path_myddir'});
if ( $idx > 0 )
{
mtr_add_arg($args, "%s--skip-innodb", $prefix);
}
if ( $opt_skip_ndbcluster ) if ( $opt_skip_ndbcluster )
{ {
mtr_add_arg($args, "%s--skip-ndbcluster", $prefix); mtr_add_arg($args, "%s--skip-ndbcluster", $prefix);
@ -1674,7 +1683,7 @@ sub mysqld_arguments ($$$$$) {
if ( $type eq 'slave' ) if ( $type eq 'slave' )
{ {
my $slave_server_id= 2 + $idx; my $slave_server_id= 2 + $idx;
my $slave_rpl_rank= $idx > 0 ? 2 : $slave_server_id; my $slave_rpl_rank= $slave_server_id;
mtr_add_arg($args, "%s--datadir=%s", $prefix, mtr_add_arg($args, "%s--datadir=%s", $prefix,
$slave->[$idx]->{'path_myddir'}); $slave->[$idx]->{'path_myddir'});

2
mysql-test/mysql-test-run.sh
View File

@ -307,7 +307,7 @@ while test $# -gt 0; do
--ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \ --ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \
--ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \ --ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem \
--ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem" --ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem"
MYSQL_TEST_SSL_OPTS="--ssl-ca=$BASEDIR/SSL/cacert.pem \ MYSQL_TEST_SSL_OPTS="--ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem \
--ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem \ --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem \
--ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem" ;; --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem" ;;
--no-manager | --skip-manager) USE_MANAGER=0 ;; --no-manager | --skip-manager) USE_MANAGER=0 ;;