Commit 6356c580 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1 

into  mysql.com:/Users/emurphy/src/work/mysql-4.1
parents c9914ac6 295a5542

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1052,3 +1052,4 @@ vio/test-ssl 
vio/test-sslclient

vio/test-sslserver

vio/viotest-ssl

scripts/mysqlhotcopy.sh.rej

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ dlenev@build.mysql.com 
dlenev@jabberwock.localdomain

dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

elliot@mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@bk-internal.mysql.com

scripts/mysqlhotcopy.sh

+17 −3
Original line number Diff line number Diff line
@@ -746,9 +746,15 @@ sub record_log_pos { 
	my ($file,$position) = get_row( $dbh, "show master status" );

	die "master status is undefined" if !defined $file || !defined $position;

	

	my ($master_host, undef, undef, undef, $log_file, $log_pos ) 

	    = get_row( $dbh, "show slave status" );

	

	my $row_hash = get_row_hash( $dbh, "show slave status" );

	my ($master_host, $log_file, $log_pos ); 

	if ( $dbh->{mysql_serverinfo} =~ /^3\.23/ ) {

	    ($master_host, $log_file, $log_pos ) 

	      = @{$row_hash}{ qw / Master_Host Log_File Pos / };

	} else {

	    ($master_host, $log_file, $log_pos ) 

	      = @{$row_hash}{ qw / Master_Host Master_Log_File Read_Master_Log_Pos / };

	}

	my $hostname = hostname();

	

	$dbh->do( qq{ replace into $table_name
@@ -773,6 +779,14 @@ sub get_row { 
  return $sth->fetchrow_array();

}



sub get_row_hash {

  my ( $dbh, $sql ) = @_;



  my $sth = $dbh->prepare($sql);

  $sth->execute;

  return $sth->fetchrow_hashref();

}



sub scan_raid_dir {

    my ( $r_db_files, $data_dir, @raid_dir ) = @_;