Merge trift2.:/M41/tmp_merge
into trift2.:/M50/merge-4.1-to-5.0 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_locale.cc: Auto merged sql/item_timefunc.cc: Merging by "ul", as asked in the original changeset. support-files/mysql.spec.sh: Manual merge, keeping alphabetic order.
Showing
Please register or sign in to comment