mariadb/libmysql
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_settings.h Bug#12897501 REPLICATION DOES NOT SUPPORT WINDOWS AUTH PLUG-IN 2011-09-14 16:10:18 +02:00
CMakeLists.txt MDEV-4216 : export additional functions mysql_get_timeout_value(),mysql_get_timeout_value_ms(), mysql_get_socket() from shared client library. They are documented as part of async API. 2013-03-01 20:58:19 +01:00
conf_to_src.c A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all 2010-11-24 12:53:39 +03:00
errmsg.c Updated/added copyright headers 2011-06-30 17:46:53 +02:00
get_password.c Fixes for Windows XP 2013-03-26 10:34:21 +01:00
libmysql.c Merging from 5.3 2013-07-08 16:49:42 +04:00
libmysql.def Bug #12325444 : 60746: CLIENT_PLUGIN.H IS BROKEN 2011-04-06 17:31:26 +03:00
libmysql.ver.in BUG#3074: Unversioned symbols in shared library 2006-01-17 18:51:08 +04:00
libmysql_rpm_version.in MDEV-4183: Export additional symbols from RPMs , compatibly to distribution RPMs. 2013-02-18 20:35:11 +01:00
rpm_support.cc MDEV-3842, MDEV-3923 : 2013-01-25 17:26:10 +01:00