-
unknown authored
into mysql.com:/home/cps/mysql/trees/mysql-5.0 mysql-test/r/sp.result: manual merge mysql-test/t/sp.test: manual merge
7f70f599
into mysql.com:/home/cps/mysql/trees/mysql-5.0 mysql-test/r/sp.result: manual merge mysql-test/t/sp.test: manual merge