SOURCES: drupal-replication.patch, drupal-emptypass.patch - fix pa...

[glen]

Author: glen                         Date: Fri Oct 28 19:48:35 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix patch order

---- Files affected:
SOURCES:
   drupal-replication.patch (1.3 -> 1.4) , drupal-emptypass.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/drupal-replication.patch
diff -u SOURCES/drupal-replication.patch:1.3 SOURCES/drupal-replication.patch:1.4
--- SOURCES/drupal-replication.patch:1.3	Fri Oct 28 21:07:08 2005
+++ SOURCES/drupal-replication.patch	Fri Oct 28 21:48:29 2005
@@ -248,14 +248,14 @@
  $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());
    }

================================================================
Index: SOURCES/drupal-emptypass.patch
diff -u SOURCES/drupal-emptypass.patch:1.2 SOURCES/drupal-emptypass.patch:1.3
--- SOURCES/drupal-emptypass.patch:1.2	Mon Aug 15 15:26:07 2005
+++ SOURCES/drupal-emptypass.patch	Fri Oct 28 21:48:30 2005
@@ -10,14 +10,14 @@
 #   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());
    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/drupal-replication.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SOURCES/drupal-emptypass.patch?r1=1.2&r2=1.3&f=u