-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/information_schema.result: manual merge mysql-test/t/information_schema.test: manual merge
7e5f4fe2
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/r/information_schema.result: manual merge mysql-test/t/information_schema.test: manual merge