bk commit into 4.1 tree (elliot:1.2316) BUG#7967

[Elliot Murphy]

Below is the list of changes that have just been committed into a local
4.1 repository of emurphy. When emurphy does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2316 05/06/06 11:07:23 elliot@stripped +2 -0
  Fix BUG#7967 

  BitKeeper/etc/logging_ok
    1.397 05/06/06 10:48:34 elliot@stripped +1 -0
    Logging to logging@stripped accepted

  scripts/mysqlhotcopy.sh
    1.50 05/06/06 10:48:12 elliot@stripped +11 -2
    BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so 
    that --record-log-pos option will work with both 4.0 and 4.1 slaves and
    will not break again if there are more column changes to output from 
    SHOW SLAVE STATUS. 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	elliot
# Host:	agony.local
# Root:	/Users/emurphy/src/work/mysql-4.1

--- 1.49/scripts/mysqlhotcopy.sh	2005-02-18 15:36:14 -05:00
+++ 1.50/scripts/mysqlhotcopy.sh	2005-06-06 10:48:12 -04:00
@@ -746,8 +746,9 @@
 	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 ) 
+	    = @row_hash{ qw / Master_Host Master_LogFile Read_Master_Log_Pos / };
 	
 	my $hostname = hostname();
 	
@@ -771,6 +772,14 @@
   my $sth = $dbh->prepare($sql);
   $sth->execute;
   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 {

--- 1.396/BitKeeper/etc/logging_ok	2005-06-03 15:09:53 -04:00
+++ 1.397/BitKeeper/etc/logging_ok	2005-06-06 10:48:34 -04:00
@@ -47,6 +47,7 @@
 dlenev@stripped
 dlenev@stripped
 ejonore@stripped
+elliot@stripped
 evgen@moonbone.(none)
 evgen@stripped
 gbichot@stripped