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

..

rpl_vcol.result

post-merge fixes.

2011-07-02 22:12:12 +02:00

vcol_archive.result

lots of post-merge changes

2011-04-25 17:22:25 +02:00

vcol_blackhole.result

lots of post-merge changes

2011-04-25 17:22:25 +02:00

vcol_blocked_sql_funcs_innodb.result

after merge changes:

2011-12-12 23:58:40 +01:00

vcol_blocked_sql_funcs_myisam.result

after merge changes:

2011-12-12 23:58:40 +01:00

vcol_column_def_options_innodb.result

after merge changes:

2011-12-12 23:58:40 +01:00

vcol_column_def_options_myisam.result

after merge changes:

2011-12-12 23:58:40 +01:00

vcol_csv.result

lots of post-merge changes

2011-04-25 17:22:25 +02:00

vcol_handler_innodb.result

…

vcol_handler_maria.result

Fix for launchpad bug #612894

2010-08-03 12:49:25 +03:00

vcol_handler_myisam.result

…

vcol_ins_upd_innodb.result

merge with xtradb-5.5.15

2011-07-18 23:04:24 +02:00

vcol_ins_upd_myisam.result

post-merge fixes.

2011-07-02 22:12:12 +02:00

vcol_keys_innodb.result

Fixed that SHOW COLUMNS for a virtual persistent column shows 'PERSISTENT' instead of 'VIRTUAL'

2011-06-06 17:25:01 +03:00

vcol_keys_myisam.result

5.3 merge

2012-01-13 15:50:02 +01:00

vcol_memory.result

lots of post-merge changes

2011-04-25 17:22:25 +02:00

vcol_merge.result

lots of post-merge changes

2011-04-25 17:22:25 +02:00

vcol_misc.result

MDEV-4667 DATE('string') incompability between mysql and mariadb

2013-07-03 09:46:20 +02:00

vcol_non_stored_columns_innodb.result

virtual columns:

2010-12-31 10:39:14 +01:00

vcol_non_stored_columns_myisam.result

virtual columns:

2010-12-31 10:39:14 +01:00

vcol_partition_innodb.result

portability fix for vcol.vcol_partition_myisam test

2010-03-23 10:22:33 +01:00

vcol_partition_myisam.result

portability fix for vcol.vcol_partition_myisam test

2010-03-23 10:22:33 +01:00

vcol_select_innodb.result

5.3 merge

2012-02-21 20:51:56 +01:00

vcol_select_myisam.result

5.3.4 merge

2012-02-15 18:08:08 +01:00

vcol_supported_sql_funcs_innodb.result

after merge changes:

2011-12-12 23:58:40 +01:00

vcol_supported_sql_funcs_myisam.result

after merge changes:

2011-12-12 23:58:40 +01:00

vcol_syntax.result

…

vcol_trigger_sp_innodb.result

Fixed bug mdev-3845.

2012-11-09 23:51:51 -08:00

vcol_trigger_sp_myisam.result

Fixed bug mdev-3845.

2012-11-09 23:51:51 -08:00

vcol_view_innodb.result

5.3.4 merge

2012-02-15 18:08:08 +01:00

vcol_view_myisam.result

5.3.4 merge

2012-02-15 18:08:08 +01:00