]> git.pld-linux.org Git - packages/drupal.git/commitdiff
- fix patch order
authorElan Ruusamäe <glen@pld-linux.org>
Fri, 28 Oct 2005 19:48:30 +0000 (19:48 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    drupal-emptypass.patch -> 1.3
    drupal-replication.patch -> 1.4

drupal-emptypass.patch
drupal-replication.patch

index c2aa9a87df5245db19f5bc73c121b9cdcee4ce63..0fbf5c03483d9b22c2a27cc0a6a2edd796ae1aa6 100644 (file)
 #   mysql_select_db(substr($url['path'], 1)) or die('unable to select database');
 # 
 #   return $connection;
---- ./includes/database.mysql.inc~     2005-08-15 16:11:07.000000000 +0300
-+++ ./includes/database.mysql.inc      2005-08-15 16:11:39.000000000 +0300
+--- ./includes/database.mysql.inc~     2005-10-28 22:32:31.000000000 +0300
++++ ./includes/database.mysql.inc      2005-10-28 22:32:57.000000000 +0300
 @@ -29,7 +29,7 @@
    }
  
    // For replication setups, we will assume that dieing is bad 
--  $connection = mysql_pconnect($url['host'], $url['user'], $url['pass'], TRUE);
-+  $connection = mysql_pconnect($url['host'], $url['user'], @$url['pass'], TRUE);
+-  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE);
++  $connection = mysql_connect($url['host'], $url['user'], @$url['pass'], TRUE);
    if(!is_resource($connection) && $critical) {
      die(mysql_error());
    }
index cc13a095809952ac20d301510cbd61a046dad3d6..8bee8c71eaab3ac535f4a74dbccd5bcc8c66af13 100644 (file)
@@ -248,14 +248,14 @@ diff -urN drupal-4.6.0/includes/database.mysql.inc drupal-test/includes/database
  $db_prefix = '';
  
  /**
---- ./includes/database.mysql.inc~     2005-10-28 22:04:50.000000000 +0300
-+++ ./includes/database.mysql.inc      2005-10-28 22:05:32.000000000 +0300
+--- ./includes/database.mysql.inc~     2005-10-28 22:31:38.000000000 +0300
++++ ./includes/database.mysql.inc      2005-10-28 22:31:53.000000000 +0300
 @@ -29,7 +29,7 @@
    }
  
    // For replication setups, we will assume that dieing is bad 
--  $connection = mysql_pconnect($url['host'], $url['user'], @$url['pass'], TRUE);
-+  $connection = mysql_connect($url['host'], $url['user'], @$url['pass'], TRUE);
+-  $connection = mysql_pconnect($url['host'], $url['user'], $url['pass'], TRUE);
++  $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE);
    if(!is_resource($connection) && $critical) {
      die(mysql_error());
    }
This page took 0.126918 seconds and 4 git commands to generate.