Index: /trunk/psLib/test/dataIO/tst_psDB.c
===================================================================
--- /trunk/psLib/test/dataIO/tst_psDB.c	(revision 4317)
+++ /trunk/psLib/test/dataIO/tst_psDB.c	(revision 4318)
@@ -9,6 +9,6 @@
  *  @author Aaron Culliney, MHPCC
  *
- *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:22:43 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 19:04:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1442,6 +1442,23 @@
         return 7;
     }
-
     psFree(ary);
+
+    // Attempt to dump row with database NULL
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL database");
+    if(psDBDumpRows(NULL,table)!=NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect return non-NULL for NULL database specified");
+        psDBDropTable(dbh,table);
+        psDBCleanup(dbh);
+        return 8;
+    }
+
+    // Attempt to dump row with table NULL
+    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL table");
+    if(psDBDumpRows(dbh,NULL)!=NULL) {
+        psError(PS_ERR_UNKNOWN,true,"Did not expect return non-NULL for NULL table specified");
+        psDBDropTable(dbh,table);
+        psDBCleanup(dbh);
+        return 9;
+    }
 
     psDBDropTable(dbh, table);
Index: /trunk/psLib/test/dataIO/verified/tst_psDB.stderr
===================================================================
--- /trunk/psLib/test/dataIO/verified/tst_psDB.stderr	(revision 4317)
+++ /trunk/psLib/test/dataIO/verified/tst_psDB.stderr	(revision 4318)
@@ -243,45 +243,15 @@
 
 <DATE><TIME>|<HOST>|I|TPDBDumpRows
-    psDBDumpRows shall dump all rows from a test table.
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[randrow1]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[12345]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[9876.5]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[456.75]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_bool]=[Yay]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32_0]=[1]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[randrow2]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[2345]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[876.5]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[56.75]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_bool]=[Nay]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32_0]=[2]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_string]=[hello world!]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32]=[1974]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f32]=[3.14159]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_f64]=[2.71828]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_bool]=[Yay]
-<DATE><TIME>|<HOST>|I|_print_row
-    [key_s32_0]=[3]
+    Following should generate error message for NULL database
+<DATE><TIME>|<HOST>|E|p_psDBRunQuery (FILE:LINENO)
+    Invalid psDB has been specified.
+<DATE><TIME>|<HOST>|E|psDBSelectRows (FILE:LINENO)
+    Query execution failed.
 <DATE><TIME>|<HOST>|I|TPDBDumpRows
-    found expected output.
-<DATE><TIME>|<HOST>|I|TPDBDumpRows
-    found expected output.
+    Following should generate error message for NULL table
+<DATE><TIME>|<HOST>|E|p_psDBRunQuery (FILE:LINENO)
+    Failed to execute SQL query.  Error: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'null)' at line 1
+<DATE><TIME>|<HOST>|E|psDBSelectRows (FILE:LINENO)
+    Query execution failed.
 
 ---> TESTPOINT PASSED (psDB{dbDumpRows} | tst_psDB.c)