bzr commit into mysql-6.0-bugteam branch (patrick.crews:3306) Bug#44937

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/backup_ext/mysql-6.0-new/ based on revid:staale.smedseng@stripped

 3306 Patrick Crews	2009-06-04
      Bug#44937: backup.backup_external_non_win fails if it cannot detect DBD::mysql
      
      Proposed patch for fixing this.  Found the problem was caused by multiple perl
      installations.  The pre-req checking include file detects dbd::mysql for one
      perl installation, but the $MYSQL_CONVERT_TABLE_FORMAT script uses the /usr/bin/perl
      version.
      
      Adding 'perl' before the calls to the script will correct this.  However, it might
      also be possible to change the include file to be more strict.

    modified:
      mysql-test/suite/backup/t/backup_external_non_win.test
=== modified file 'mysql-test/suite/backup/t/backup_external_non_win.test'
--- a/mysql-test/suite/backup/t/backup_external_non_win.test	2009-04-22 08:31:38 +0000
+++ b/mysql-test/suite/backup/t/backup_external_non_win.test	2009-06-04 17:05:44 +0000
@@ -76,7 +76,7 @@ INSERT INTO db2.t1(b,c) VALUES
 SHOW CREATE TABLE db1.t1;
 
 source $MYSQLTEST_VARDIR/tmp/mctf.inc;
---exec $MYSQL_CONVERT_TABLE_FORMAT --user=root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  --type=innodb db1
+--exec perl $MYSQL_CONVERT_TABLE_FORMAT --user=root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  --type=innodb db1
 
 --echo
 --echo # Check the storage engine of table is chnaged to innodb
@@ -97,7 +97,7 @@ SHOW CREATE TABLE db1.t1;
 
 --echo # Changing the storage engine back to myisam
 source $MYSQLTEST_VARDIR/tmp/mctf.inc;
---exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  db1
+--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  db1
 
 SHOW CREATE TABLE db1.t1;
 --remove_file $MYSQLD_BACKUPDIR/db1.bak
@@ -157,7 +157,7 @@ BACKUP DATABASE db1 TO 'db1.bak';
 
 --disable_warnings
 source $MYSQLTEST_VARDIR/tmp/mctf.inc;
---exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  --type=myisam db1
+--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  --type=myisam db1
 --enable_warnings
 
 --echo # Note that tablespace will be ignored by db1.t2
@@ -192,7 +192,7 @@ RESTORE FROM 'db1.bak' OVERWRITE;
 SHOW CREATE TABLE db1.t2;
 
 source $MYSQLTEST_VARDIR/tmp/mctf.inc;
---exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  --type=falcon db1
+--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT  --type=falcon db1
 
 SHOW CREATE TABLE db1.tpl;
 SHOW CREATE TABLE db1.tph;
@@ -225,7 +225,7 @@ DROP VIEW db2.v1;
 
 --echo # Changing the storage engine back to myisam after restore
 source $MYSQLTEST_VARDIR/tmp/mctf.inc;
---exec $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT db1
+--exec perl $MYSQL_CONVERT_TABLE_FORMAT -u root -S $MASTER_MYSOCK --port=$MASTER_MYPORT db1
 
 SHOW CREATE TABLE db1.t1;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]