unknown 80a8d8c4f8 Merge mysql.com:/home/jimw/my/mysql-4.1-clean ...

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/t/func_math.test:
  Auto merged
mysql-test/r/func_math.result:
  Resolve conflict
sql/item_func.cc:
  Resolve conflict

2005-10-27 18:46:00 -07:00

4.1 KiB

Raw Blame History

View Raw