summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-0/+1
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2018-10-271-0/+2
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-231-0/+1
| | |\
| | | * Create .gitignore as a copy of .bzrignoreJon Olav Hauglid2014-10-061-0/+3071
* | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-121-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-0/+1
| |\ \ \
| | * | | MDEV-11036 Add link wsrep_sst_rsync_wan -> wsrep_sst_rsyncbb-sachin-11036Sachin Setiya2017-06-201-0/+1
* | | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-0/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-0/+6
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Also ignore macOS .DS_Store Finder junk.Teodor Mircea Ionita2018-06-101-0/+3
| | * | Ignore .cbp QtCreator && CodeBlocks project filesTeodor Mircea Ionita2018-06-101-0/+3
| | |/
| * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-1/+1
| |\ \ | | |/
| | * MDEV-12074 selinux build failure on Fedora 24Sergei Golubchik2017-02-271-1/+1
* | | .gitignore mariabackupSergei Golubchik2017-04-271-0/+3
* | | update gitignore with commonly used (by me) out-of-source builddir namesVladislav Vaintroub2017-04-271-0/+4
* | | put all aws_key_management plugin files into plugin/aws_key_managementSergei Golubchik2017-03-311-0/+3
* | | Post merge review fixesVicențiu Ciorbaru2017-01-171-1/+1
* | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-0/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-01-121-0/+1
| |\ \ | | |/
| | * MDEV-11676 Starting service with mysqld_safe_helper fails in SELINUX "enforci...Sergei Golubchik2017-01-111-0/+1
| * | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-0/+1
| |\ \ | | |/
| | * Numerous issues in mysqld_safeSergei Golubchik2016-12-221-0/+1
* | | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-231-0/+2
* | | 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
* | | MDEV-7875 Duplicate maria_add_gis_sp script in the sources.Alexey Botchkov2016-01-251-0/+2
* | | 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
* | | 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
| * | | 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
* | | .gitignore: add generated mroonga *.result filesSergei Golubchik2015-05-051-16/+2
| |/ |/|
* | - Adding files to ignore from C C++ and Visual StudioOlivier Bertrand2015-03-161-0/+233
|/
* Fix the tree to work in git. Backport corresponing 10.1 changes.Sergei Golubchik2015-02-101-0/+232