svn rev 7088 - mysql only.

Code in svn revision 7088 has been integrated. All tests are passing with the
mysql database. Still work is pending on making them work with postgresql.