• unknown's avatar
    Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8ba2819f
    unknown authored
    into  mysql.com:/misc/mysql/31990/50-31990
    
    
    mysql-test/r/cast.result:
      Auto merged
    mysql-test/r/type_date.result:
      Auto merged
    mysql-test/t/cast.test:
      Auto merged
    sql/field.cc:
      Auto merged
    sql/field.h:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/item_timefunc.h:
      Auto merged
    mysql-test/t/type_date.test:
      manual merge
    8ba2819f
field.h 63.9 KB