Fix a problem with sub-queries and the flattening optimization. Also handle an extra case of database corruption. (CVS 2324)

FossilOrigin-Name: f7858d8830cdd0f57b8f9bc73068d29a7062b8ac