-
unknown authored
into host.loc:/home/uchum/work/5.1-opt sql/sql_show.cc: Auto merged mysql-test/r/information_schema.result: Merge with 5.0-opt. mysql-test/t/information_schema.test: Merge with 5.0-opt.
f1bb7c20
into host.loc:/home/uchum/work/5.1-opt sql/sql_show.cc: Auto merged mysql-test/r/information_schema.result: Merge with 5.0-opt. mysql-test/t/information_schema.test: Merge with 5.0-opt.