SOURCES: drupal-replication.patch,
drupal-emptypass.patch - update...
glen
glen at pld-linux.org
Tue Dec 20 11:14:56 CET 2005
Author: glen Date: Tue Dec 20 10:14:56 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated to 4.6.5
---- Files affected:
SOURCES:
drupal-replication.patch (1.4 -> 1.5) , drupal-emptypass.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/drupal-replication.patch
diff -u SOURCES/drupal-replication.patch:1.4 SOURCES/drupal-replication.patch:1.5
--- SOURCES/drupal-replication.patch:1.4 Fri Oct 28 21:48:29 2005
+++ SOURCES/drupal-replication.patch Tue Dec 20 11:14:51 2005
@@ -144,7 +144,7 @@
/**
diff -urN drupal-4.6.0/includes/database.mysql.inc drupal-test/includes/database.mysql.inc
---- drupal-4.6.0/includes/database.mysql.inc 2005-04-14 13:50:23.000000000 -0500
+--- drupal-4.6.5/includes/database.mysql.inc 2005-04-14 13:50:23.000000000 -0500
+++ drupal-test/includes/database.mysql.inc 2005-05-29 09:28:22.490546558 -0500
@@ -20,7 +20,7 @@
* performance, however, when the overhead to connect to your database is high
@@ -160,18 +160,18 @@
}
- $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE) or die(mysql_error());
-- mysql_select_db(substr($url['path'], 1)) or die('unable to select database');
+- mysql_select_db(substr($url['path'], 1), $connection) or die('unable to select database');
+ // For replication setups, we will assume that dieing is bad
-+ $connection = mysql_pconnect($url['host'], $url['user'], $url['pass'], TRUE);
-+ if(!is_resource($connection) && $critical) {
++ $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE);
++ if (!is_resource($connection) && $critical) {
+ die(mysql_error());
+ }
+ // We die on bad slaves. These should be taken care of
+ // maybe hook this somehow or something
-+ mysql_select_db(substr($url['path'], 1)) or die(mysql_error());
++ mysql_select_db(substr($url['path'], 1), $connection) or die(mysql_error());
- return $connection;
-+ return ($connection)?$connection:false;
++ return ($connection) ? $connection : false;
}
/**
@@ -214,21 +214,6 @@
if (variable_get('dev_query', 0)) {
list($usec, $sec) = explode(' ', microtime());
$stop = (float)$usec + (float)$sec;
-@@ -67,6 +97,7 @@
- }
- }
-
-+
- /**
- * Fetch one result row from the previous query as an object.
- *
-@@ -239,4 +270,4 @@
- * @} End of "ingroup database".
- */
-
--?>
-\ No newline at end of file
-+?>
--- ./sites/default/settings.php~ 2005-08-15 16:41:07.000000000 +0300
+++ ./sites/default/settings.php 2005-08-15 16:42:47.000000000 +0300
@@ -77,8 +77,15 @@
@@ -248,14 +233,3 @@
$db_prefix = '';
/**
---- ./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);
- if(!is_resource($connection) && $critical) {
- die(mysql_error());
- }
================================================================
Index: SOURCES/drupal-emptypass.patch
diff -u SOURCES/drupal-emptypass.patch:1.3 SOURCES/drupal-emptypass.patch:1.4
--- SOURCES/drupal-emptypass.patch:1.3 Fri Oct 28 21:48:30 2005
+++ SOURCES/drupal-emptypass.patch Tue Dec 20 11:14:51 2005
@@ -1,23 +1,11 @@
-# without replication patch:
-#--- ./includes/database.mysql.inc~ 2005-04-14 21:50:23.000000000 +0300
-#+++ ./includes/database.mysql.inc 2005-05-18 18:48:24.970031862 +0300
-#@@ -28,7 +28,7 @@
-# $url['host'] = $url['host'] .':'. $url['port'];
-# }
-#
-#- $connection = mysql_connect($url['host'], $url['user'], $url['pass'], TRUE) or die(mysql_error());
-#+ $connection = mysql_connect($url['host'], $url['user'], @$url['pass'], TRUE) or die(mysql_error());
-# mysql_select_db(substr($url['path'], 1)) or die('unable to select database');
-#
-# return $connection;
---- ./includes/database.mysql.inc~ 2005-10-28 22:32:31.000000000 +0300
-+++ ./includes/database.mysql.inc 2005-10-28 22:32:57.000000000 +0300
+--- drupal-4.6.5/includes/database.mysql.inc~ 2005-12-20 12:05:30.000000000 +0200
++++ drupal-4.6.5/includes/database.mysql.inc 2005-12-20 12:06:30.000000000 +0200
@@ -29,7 +29,7 @@
}
// For replication setups, we will assume that dieing is bad
- $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) {
++ $connection = mysql_connect($url['host'], $url['user'], (isset($url['pass']) ? $url['pass'] : null), TRUE);
+ if (!is_resource($connection) && $critical) {
die(mysql_error());
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/drupal-replication.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/drupal-emptypass.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list