• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 80a8d8c4
    unknown authored
    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
    80a8d8c4
func_math.test 4.15 KB