Index: branches/5.2.x/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r16758 -r16768
--- branches/5.2.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 16758)
+++ branches/5.2.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 16768)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_connection.php 16758 2023-11-13 08:43:02Z alex $
+* @version	$Id: db_connection.php 16768 2023-11-16 08:47:38Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -393,7 +393,19 @@
 		 */
 		protected function callErrorHandler($sql)
 		{
-			return call_user_func($this->errorHandler, $this->errorCode, $this->errorMessage, $sql);
+			$error_msg = $this->errorMessage;
+
+			// Specify slave servers or nothing for master/single database setups.
+			if ( $this->serverIndex ) {
+				$error_msg = '[Server #' . $this->serverIndex . '] ' . $error_msg;
+			}
+
+			return call_user_func(
+				$this->errorHandler,
+				$this->errorCode,
+				$error_msg,
+				$sql
+			);
 		}
 
 		/**