diff --git a/ChangeLog b/ChangeLog
index e6f47c50a..2fd0d54e7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@ $Source$
 2003-03-22 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/defines.lib.php3: Small bugfix.
     * libraries/defines_php.lib.php3: New constant: PMA_MYSQL_CLIENT_API.
+    * libraries/common.lib.php3: Possible fix against "wrong parameter count"
+      errors.
 
 2003-03-22 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/transformations/text_plain__imagelink: display the
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index fbd354410..67dd1bda1 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -804,7 +804,8 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             // must be open after this one so it would be default one for all the
             // scripts)
             if ($cfg['Server']['controluser'] != '') {
-                if (PMA_PHP_INT_VERSION >= 40300) {
+                // rabus: 3.23.49 is the MySQL client API bundled with php 4.3.0.
+                if (PMA_PHP_INT_VERSION >= 40300 && PMA_MYSQL_CLIENT_API >= 32349) {
                     $dbh            = @$connect_func(
                                           $cfg['Server']['host'] . $server_port . $server_socket,
                                           $cfg['Server']['controluser'],
@@ -1635,7 +1636,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
             if ($format == '') {
                 $format = $datefmt;
             }
-            
+
             if ($timestamp == -1) {
                 $timestamp = time();
             }