-
unknown authored
into gleb.loc:/home/uchum/work/bk/5.1-opt sql/item_func.h: Auto merged mysql-test/r/sp.result: Merge with 5.0-opt. mysql-test/t/sp.test: Merge with 5.0-opt. sql/item_func.cc: Merge with 5.0-opt.
5ad95256
into gleb.loc:/home/uchum/work/bk/5.1-opt sql/item_func.h: Auto merged mysql-test/r/sp.result: Merge with 5.0-opt. mysql-test/t/sp.test: Merge with 5.0-opt. sql/item_func.cc: Merge with 5.0-opt.