MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Patrick Crews Date:June 13 2009 10:12am
Subject:bzr commit into mysql-pe branch (patrick.crews:3359) Bug#44937
View as plain text  
#At file:///Users/pcrews/usr/local/bin/data1/work/backup_ext/mysql-6.0-bugteam/ based on revid:davi.arnaut@stripped

 3359 Patrick Crews	2009-06-13
      Bug#44937: backup.backup_external_non_win fails if it cannot detect DBD::mysql
      
      Re-submitting my initial patch rather than altering the shebang line in the 
      mysql_convert_table_format script based on pstoev's feedback.
      
      Altered the test to explicitly call perl in the test.
      This bug was caused by having two installations of perl on a machine.
      The include/have_dbd.inc file checked one version (based in /opt dir)
      while the script was using /usr/bin/perl due to the shebang line + how
      the test called the script.
      
      This patch ensures that the check and the test both use the same version of perl.

    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-13 10:12:02 +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/patrick.crews@sun.com-20090613101202-stfv5urrxz177ozl.bundle
Thread
bzr commit into mysql-pe branch (patrick.crews:3359) Bug#44937Patrick Crews13 Jun