mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
175349 commits 2773 branches 343 tags 1.6 GiB
Commit graph

19 commits

Author SHA1 Message Date
Sergei Golubchik
736f821c42 Merge branch 'connect/10.1' into 10.1 2016-06-28 22:12:50 +02:00
Olivier Bertrand
f8bc587c1a Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1 2016-05-22 14:49:14 +02:00
Olivier Bertrand
bbdeb911b8 - Add the JdbcInterface.java to the project 
added:   storage/connect/JdbcInterface.java

- Add *.java to be handled
  modified:   .gitattributes
 2016-04-27 12:57:27 +02:00
Olivier Bertrand
9c6405fefa Commit resolved conflicts 2015-09-18 18:39:08 +02:00
Sergei Golubchik
772c3f3702 .gitattributes: pcre/testdata/greppatN4 -text 2015-08-01 17:48:41 +02:00
Sergei Golubchik
810cf362ea Merge branch '5.5' into 10.0 2015-06-11 20:20:35 +02:00
Olivier Bertrand
7482f073ae Commit od last modifications made for version 10.0 2015-06-06 19:23:06 +02:00
Olivier Bertrand
f8fa5fe1bc Commit merge resolve 2015-06-05 23:24:39 +02:00
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
5ae8d06df4 Update .gitattributes 2015-05-08 17:27:41 +03: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
c1b07ff9b7 update .gitattributes 2015-05-08 11:56:48 +02:00
Olivier Bertrand
48a77e6188 Make this repository aligned with 10.0 one 2015-04-05 14:03:35 +02:00
Olivier Bertrand
57aaccef52 - Adding files to ignore from C C++ and Visual Studio 
- Making result files to be ended by LF to avoid test failures
 2015-03-16 17:37:00 +01:00
Sergei Golubchik
63108dc9d2 Fix the tree to work in git. Backport corresponing 10.1 changes. 2015-02-10 12:26:21 +01:00
Sergei Golubchik
f883f3ef86 git: ignore errmsg.sys and typescript, better diff header for C/C++ files 2014-08-27 21:25:06 +02:00