-
unknown authored
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411 BitKeeper/deleted/.del-collapsed~fbec3523369aae99: Delete: BitKeeper/etc/collapsed BitKeeper/etc/collapsed: 'Auto converge' mysql-test/r/func_test.result: Manual merge. mysql-test/t/func_test.test: Manual merge. sql/item_func.cc: Manual merge.
c055a9c4