summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-211-0/+1
|\
| * LDML refactoring for "MDEV-9711 NO PAD collations"Alexander Barkov2016-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | - Moving detection of the MY_CS_CSSORT, MY_CS_PUREASCII, MY_CS_NONASCII flags of loadable collations from add_collation() in mysys.c to my_cset_init_8bit() and my_coll_init_simple() in ctype-simple.c. - Adding tests that these flags are set properly for loadable collations - Moving LDML test related *.xml files from mysql-test/std_data/ to mysql-test/std_data/ldml/, as there will be more *.xml test files
* | .gitignore for rpm buildsSergei Golubchik2016-09-041-1/+3
|/
* - New version of the java JdbcInterfaceOlivier Bertrand2016-05-231-0/+2
| | | | | | | | modified: storage/connect/JdbcInterface.class modified: storage/connect/JdbcInterface.java - Ignore *.tlog and .res files modified: .gitignore
* Ignore files in tmp (like mysqld.S)Monty2016-04-281-0/+1
|
* Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-0/+3
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-0/+3
| |\
| | * dtrace in cmakeSergei Golubchik2016-02-151-0/+3
| | | | | | | | | | | | | | | 1. ignore generated dtrace files 2. don't rewrite probes_mysql_nodtrace.h in-place
* | | MDEV-7875 Duplicate maria_add_gis_sp script in the sources.Alexey Botchkov2016-01-251-0/+2
| | | | | | | | | | | | | | | Now both are generated by the cmake from the scripts/maria_add_gis_sp.sql.in
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-26/+26
|\ \ \ | |/ /
| * | Merge branch 'merge-tokudb-5.6' into 10.0Sergei Golubchik2015-12-151-25/+26
| | |
* | | Ignore tokudb toolMichael Widenius2015-10-221-0/+1
| | |
* | | MDEV-427/MDEV-5713 Add systemd script with notify functionalityDaniel Black2015-10-121-0/+1
|/ /
* | Merge 'https://github.com/Buggynours/MariaDB 10.0' into 10.0Sergei Golubchik2015-08-031-0/+4
|\ \
| * | Fix loosing result lines when all of this is true:Olivier Bertrand2015-07-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The table type is MYSQL The query where clause includes an indexed column The where clause contains < or <= operator on this column Change version date modified: storage/connect/ha_connect.cc modified: storage/connect/tabmysql.cpp Add visual studio 2013 files to ignore modified: .gitignore
* | | Merge branch 'connect-10.0' into 10.0Sergei Golubchik2015-06-161-0/+3
|\ \ \ | |/ /
| * | Commit merge resolved filesOlivier Bertrand2015-06-051-18/+4
| |\ \
| * | | Make BIN table files more flexible with new column format.Olivier Bertrand2015-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular enable to set length and endian setting. This should solve all problems on IBM390s machines. modified: storage/connect/ha_connect.cc modified: storage/connect/tabfix.cpp modified: storage/connect/tabfix.h Make DBF tables to be usable in big-endian machines (test version) modified: storage/connect/filamdbf.cpp Ignore git files on storage/connect modified: .gitignore
| * | | Typo to check buildbotOlivier Bertrand2015-05-101-0/+5
| | | |
* | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-2/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge tag 'tokudb-engine/tokudb-7.5.7' into 5.5Sergei Golubchik2015-06-031-0/+1
| |\ \
| | * | Add local cache option to make.mysql.debug.env.bashYoni Fogel2013-05-291-0/+1
| | | |
| | * | Import .gitignoreYoni Fogel2013-04-171-0/+28
| | /
* | | perfschema 5.6.24Sergei Golubchik2015-05-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | including the big commit commit 305130361bf72726de220f3d2b2787395e10be61 Author: Marc Alff <marc.alff@oracle.com> Date: Tue Feb 10 11:31:32 2015 +0100 WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6 (with the following commits) and related changes in sql/
* | | .gitignore: add generated mroonga *.result filesSergei Golubchik2015-05-051-16/+2
| |/ |/| | | | | and remove duplicates
* | - Adding files to ignore from C C++ and Visual StudioOlivier Bertrand2015-03-161-0/+233
|/ | | | - Making result files to be ended by LF to avoid test failures
* Fix the tree to work in git. Backport corresponing 10.1 changes.Sergei Golubchik2015-02-101-0/+232
View Lorry Controller Status