- fix test warning here (oursql)
- fix non-deterministic ordering point
workaround for #2838 here.  still need to figure out why an ENUM test is suddenly hitting this.