Commit graph

6 commits

Author SHA1 Message Date
Sergei Golubchik
9a3b975da6 Merge branch '5.5' into bb-5.5-serg 2015-06-05 09:51:17 +02:00
Alexander Barkov
08fa02cf22 Some MYD files (e.g. in mysql-test/std_data) could erroneously be
treated by git as text files.

Marking all MyISAM files as binary in .gitattributes: (*.frm, *.MYD, *.MYI)
2015-06-04 18:51:30 +04:00
Sergei Golubchik
934a18daec .gitattributes: *.dat files should not be CRLF converted 2015-06-03 19:42:34 +02:00
Vicentiu Ciorbaru
23b2b95f80 Update .gitattributes 2015-05-08 17:19:06 +03:00
Vicentiu Ciorbaru
6ef3c7d93e Updated .gitattributes 2015-05-08 17:09:45 +03:00
Sergei Golubchik
63108dc9d2 Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00