BISERVER-10341 Modify code to allow the catalog name compare with

different datasource to work correctly.  Returns code 7.