-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761 BitKeeper/etc/collapsed: auto-union mysql-test/r/udf.result: Auto merged mysql-test/t/udf.test: Auto merged sql/item_func.cc: Auto merged sql/udf_example.c: Auto merged
13b931a5