• Alexander Barkov's avatar
    Merging from 5.3 · 1f3ec980
    Alexander Barkov authored
    modified:
      include/my_time.h
      libmysql/libmysql.c
      mysql-test/r/adddate_454.result
      mysql-test/r/cast.result
      mysql-test/r/date_formats.result
      mysql-test/r/func_sapdb.result
      mysql-test/r/func_time.result
      mysql-test/r/mdev316.result
      mysql-test/r/parser.result
      mysql-test/r/partition_datatype.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/suite/vcol/r/vcol_misc.result
      mysql-test/t/cast.test
      sql-common/my_time.c
      sql/field.cc
      sql/field_conv.cc
      sql/filesort.cc
      sql/item.cc
      sql/item.h
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_timefunc.cc
      sql/sql_time.cc
    pending merges:
      Sergei Golubchik 2013-07-03 MDEV-4667 DATE('string') incompability betwe...
    1f3ec980