#! /bin/sh /usr/share/dpatch/dpatch-run

@DPATCH@
diff -Naur mysql-dfsg-5.0-5.0.51a.orig/scripts/mysqlhotcopy.sh mysql-dfsg-5.0-5.0.51a/scripts/mysqlhotcopy.sh
--- mysql-dfsg-5.0-5.0.51a.orig/scripts/mysqlhotcopy.sh	2008-01-11 09:43:28.000000000 -0500
+++ mysql-dfsg-5.0-5.0.51a/scripts/mysqlhotcopy.sh	2008-04-29 15:18:12.000000000 -0400
@@ -333,7 +333,7 @@
 
     $rdb->{files}  = [ @db_files ];
     $rdb->{index}  = [ @index_files ];
-    my @hc_tables = map { quote_names("$db.$_") } @dbh_tables;
+    my @hc_tables = map { quote_names("$_") } @dbh_tables;
     $rdb->{tables} = [ @hc_tables ];
 
     $rdb->{raid_dirs} = [ get_raid_dirs( $rdb->{files} ) ];
@@ -464,13 +464,15 @@
 }
 else {
     my $start = time;
+    $hc_locks =~ s/\`//g;
+    $hc_locks =~ s/\`//g;
     $dbh->do("LOCK TABLES $hc_locks");
     printf "Locked $num_tables tables in %d seconds.\n", time-$start unless $opt{quiet};
     $hc_started = time;	# count from time lock is granted
 
     # flush tables to make on-disk copy uptodate
     $start = time;
-    $dbh->do("FLUSH TABLES /*!32323 $hc_tables */");
+    $dbh->do("FLUSH TABLES");
     printf "Flushed tables ($hc_tables) in %d seconds.\n", time-$start unless $opt{quiet};
     $dbh->do( "FLUSH LOGS" ) if ( $opt{flushlog} );
     $dbh->do( "RESET MASTER" ) if ( $opt{resetmaster} );
@@ -478,7 +480,7 @@
 
     if ( $opt{record_log_pos} ) {
 	record_log_pos( $dbh, $opt{record_log_pos} );
-	$dbh->do("FLUSH TABLES /*!32323 $hc_tables */");
+	$dbh->do("FLUSH TABLES");
     }
 }
 
@@ -828,7 +830,7 @@
         } || [];
     warn "Unable to retrieve list of tables in $db: $@" if $@;
 
-    return (map { $_->[0] } @$tables);
+    return (map { $db . "." . $_->[0] } @$tables); 
 }
 
 sub quote_names {