mariadb/BitKeeper
unknown c7902f9c88 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411


BitKeeper/etc/collapsed:
  auto-union
mysql-test/r/func_test.result:
  Auto merged
sql/item_func.cc:
  Auto merged
2006-11-06 17:46:50 -05:00
..
etc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411 2006-11-06 17:46:50 -05:00
triggers BitKeeper/triggers/*crash-protect.pl: Don't print messages if nothing is wrong. 2006-10-25 18:51:50 -06:00
post-outgoing post-outgoing BitKeeper file /home/sasha/src/bk/mysql/BitKeeper/post-outgoing 2000-10-18 18:50:38 -06:00