-
unknown authored
into trift2.:/MySQL/M50/test-help-5.0 mysql-test/t/help.test: Auto merged mysql-test/r/help.result: Manual merge: 5.0 has warnings "Field 'url' doesn't have a default value" which 4.1 doesn't have.
06c2d5ca
into trift2.:/MySQL/M50/test-help-5.0 mysql-test/t/help.test: Auto merged mysql-test/r/help.result: Manual merge: 5.0 has warnings "Field 'url' doesn't have a default value" which 4.1 doesn't have.