Merge damien-katzs-computer.local:/Users/dkatz/udf50
into damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime mysql-test/r/udf.result: Auto merged mysql-test/t/udf.test: Auto merged sql/item_func.cc: Auto merged sql/udf_example.def: Auto merged sql/udf_example.c: null merge
This commit is contained in:
commit
f8c436d62f