-
unknown authored
into rurik.mysql.com:/home/igor/mysql-5.0-opt mysql-test/r/subselect.result: Manual merge mysql-test/t/subselect.test: Manual merge sql/item.cc: Manual merge
39222bff
into rurik.mysql.com:/home/igor/mysql-5.0-opt mysql-test/r/subselect.result: Manual merge mysql-test/t/subselect.test: Manual merge sql/item.cc: Manual merge