• unknown's avatar
    Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0 · 4b05efd0
    unknown authored
    into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
    
    
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/r/func_gconcat.result:
      Auto merged
    mysql-test/r/func_time.result:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    mysql-test/t/information_schema.test:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/opt_sum.cc:
      Auto merged
    4b05efd0
item_timefunc.cc 77.4 KB