The disordered vortex phases induced by line and point pinning in YBa2Cu3O7
-delta are explored. At high defect densities, only a single disordered sol
id separated from the liquid phase by a melting line is observed. At low de
fect densities the topology of the phase diagram changes dramatically, with
a vortex lattice phase adjoining disordered phases at high or low field. C
ritical points at the termination of the first-order melting line separate
the lattice and the disordered phases. The line defect disordered phases fo
llow the expected Bose glass behavior, while the point defect disordered ph
ases do not exhibit the expected vortex glass behavior.