Fix a bug in UPDATE OR REPLACE that was introduced by check-in (999).

Also clean up some compiler warnings for VC++. (CVS 1005)

FossilOrigin-Name: af6f2bdf59fb621ff3e1d061e429f01ebd7d0b42