mariadb/sql-common
Alexander Barkov 1f3ec9800c Merging from 5.3
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...
2013-07-08 16:49:42 +04:00
..
client.c MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGIN 2013-06-11 11:11:05 +02:00
client_plugin.c undo the fix for MySQL Bug#12998841 2012-08-08 12:32:34 +02:00
my_time.c Merging from 5.3 2013-07-08 16:49:42 +04:00
my_user.c Updated/added copyright headers 2011-06-30 17:46:53 +02:00
mysql_async.c MDEV-3802. Millisecond timeout support in non-blocking client library. 2012-10-12 10:54:46 +02:00
pack.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00