• unknown's avatar
    Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 · 5618d021
    unknown authored
    into  sanja.is.com.ua:/home/bell/mysql/bk/work-mrg-5.0
    
    
    configure.in:
      Auto merged
    mysql-test/r/func_math.result:
      Auto merged
    mysql-test/r/ps.result:
      Auto merged
    mysql-test/t/func_math.test:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_cache.cc:
      Auto merged
    sql/sql_cache.h:
      Auto merged
    5618d021
func_math.result 7.85 KB