From 3597f8e3adf57e37f4807efdac5f1d66c13afa43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= <lolo@phpheaven.net>
Date: Thu, 9 Aug 2001 23:55:15 +0000
Subject: [PATCH] Merged patch #449548 (fix for mysql error on no default
 server) thanks to Kendrick Vargas

---
 ChangeLog        | 3 +++
 defines.inc.php3 | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a1bbb3a5..8099e811b 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@ $Source$
 2001-08-10  Loïc Chapeaux  <lolo@phpheaven.net>
 	* tbl_replace.php3, lines 76, 78, 86, 88, 137, 139, 147, 149: fixed some
 	  others slashes bugs.
+	* defines.inc.php3, lines 41 & 43: merged patch #449548 (fix for mysql
+	  error on no default server) thanks to
+	  Kendrick Vargas <drama@users.sourceforge.net>.
 
 2001-08-09  Olivier Müller  <om@omnis.ch>
 	* releasing 2.2.0rc4
diff --git a/defines.inc.php3 b/defines.inc.php3
index 6a4cedee9..2489d8ec4 100755
--- a/defines.inc.php3
+++ b/defines.inc.php3
@@ -38,10 +38,8 @@ if (defined('PHP_OS') && eregi('win', PHP_OS)) {
 }
 
 // MySQL Version 
-//$result = @mysql_query('SELECT VERSION() AS version');
-$result = mysql_query('SELECT VERSION() AS version');
+$result = @mysql_query('SELECT VERSION() AS version');
 if ($result != FALSE && @mysql_num_rows($result) > 0) {
-    $result = mysql_query('SELECT VERSION() AS version') or mysql_die();
     $row    = mysql_fetch_array($result);
     define('MYSQL_MAJOR_VERSION', (double)substr($row['version'], 0, 4));
     define('MYSQL_MINOR_VERSION', (double)substr($row['version'], 5));