-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584 mysql-test/r/view.result: Manual merge. mysql-test/t/view.test: Manual merge.
fd218110
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584 mysql-test/r/view.result: Manual merge. mysql-test/t/view.test: Manual merge.