mysql-test/r/type_enum.result: fixed test after merge mysql-test/r/type_set.result: fixed test after merge mysys/Makefile.am: R