rows varies between runs on InnoDB.

Re-enable two test cases that was disabled due to variations in
row estimates in explain output. The fix is to replace the row estimate
column with a # pattern.