-
unknown authored
bad merge fixed mysql-test/t/isam.test: bad merge fixed mysql-test/t/lock_tables_lost_commit.test: "normal" warning in test suite disabled mysql-test/t/subselect.test: "normal" warning in test suite disabled
7eb9d41c
bad merge fixed mysql-test/t/isam.test: bad merge fixed mysql-test/t/lock_tables_lost_commit.test: "normal" warning in test suite disabled mysql-test/t/subselect.test: "normal" warning in test suite disabled