Fix merge conflicts.

.travis.yml

-language: perl
+language: "perl"
 
 perl:
   - '5.14'
@@ -30,7 +30,7 @@ install:
     - cp travisci/MultiTestDB.conf.travisci.mysql  modules/t/MultiTestDB.conf.mysql
     - cp travisci/MultiTestDB.conf.travisci.SQLite modules/t/MultiTestDB.conf.SQLite
     - mysql -u root -h localhost -e 'GRANT ALL PRIVILEGES ON *.* TO "travis"@"%"'
-    
+
 script: "./travisci/harness.sh"
 
 # Add build stage to trigger dependent builds, run sequentially after all test jobs

misc-scripts/db/multidb_sql.pl

@@ -35,8 +35,8 @@ my ( @hosts, $host, $user, $pass, $port, $expression, $dbpattern, $file, $result
 
 $user = 'ensro' ;  
 $pass = '' ;
-$port = 3306 ;  
-@hosts = qw ( ens-staging1 ens-staging2) ;
+$port = 4519;
+@hosts = qw ( mysql-ens-sta-1 ) ;
 
 GetOptions( "host|dbhost=s", \$host,
             "hosts|dbhosts=s", \@hosts,
@@ -87,7 +87,8 @@ foreach my $host ( @hosts ) {
     close FH;
   }
 
-  my $db = DBI->connect( $dsn, $user, $pass );
+  my $db = DBI->connect( $dsn, $user, $pass ) or
+      die "Unable to connect to database(s): $dsn, $user";
   my @dbnames = map {$_->[0] } @{ $db->selectall_arrayref( "show databases" ) };
   for my $dbname ( @dbnames) {   
     next if ( $dbname !~ /$dbpattern/ );