diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php3
index af9b75deb..3fe82963f 100644
--- a/libraries/relation.lib.php3
+++ b/libraries/relation.lib.php3
@@ -16,16 +16,22 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
      * @author  Mike Beck<mikebeck@users.sourceforge.net>
      * @access  public
      */
-     function PMA_query_as_cu($sql) {
+     function PMA_query_as_cu($sql,$showerror=TRUE) {
         global $err_url_0, $db, $dbh, $cfgRelation;
 
         if (isset($dbh)) {
             PMA_mysql_select_db($cfgRelation['db'],$dbh);
-            $result = @PMA_mysql_query($sql, $dbh) or PMA_mysqlDie(mysql_error($dbh), $sql, '', $err_url_0);
+            $result = @PMA_mysql_query($sql, $dbh);
+            if(!$result && $showerror==TRUE){
+                PMA_mysqlDie(mysql_error($dbh), $sql, '', $err_url_0);
+            }
             PMA_mysql_select_db($db,$dbh);
         } else {
             PMA_mysql_select_db($cfgRelation['db']);
-            $result = @PMA_mysql_query($sql) or PMA_mysqlDie('', $sql, '', $err_url_0);
+            $result = @PMA_mysql_query($sql);
+            if($result && $showerror==TRUE){
+                PMA_mysqlDie('', $sql, '', $err_url_0);
+            }
             PMA_mysql_select_db($db);
         }
         if($result){
@@ -66,6 +72,19 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){
             return '';
         }
 
+        //      check if pmadb exists
+        $tab_query    = 'SHOW DATABASES';
+        $tab_rs = PMA_query_as_cu($tab_query);
+
+        while ($curr_db = @PMA_mysql_fetch_array($tab_rs)) {
+            if($curr_db[0] == $cfg['Server']['pmadb']) {
+                $cfgRelation['db']    = $GLOBALS['cfg']['Server']['pmadb'];
+            }
+        }
+        if(!isset($cfgRelation['db'])){
+                $GLOBALS['cfg']['Server']['pmadb'] = FALSE;
+                return;
+        }
         $cfgRelation['user']  = $GLOBALS['cfg']['Server']['user'];
         $cfgRelation['db']    = $GLOBALS['cfg']['Server']['pmadb'];
 
diff --git a/pdf_pages.php3 b/pdf_pages.php3
index 54365fafa..886deb508 100755
--- a/pdf_pages.php3
+++ b/pdf_pages.php3
@@ -7,7 +7,13 @@
  */
 require('./libraries/grab_globals.lib.php3');
 require('./libraries/common.lib.php3');
+<<<<<<< pdf_pages.php3
+require('./tbl_properties_common.php3');
+require('./tbl_properties_table_info.php3');
+require('./libraries/relation.lib.php3');
+=======
 include('./db_details_common.php3');
+>>>>>>> 1.6
 
 /**
  * Settings for relation stuff