summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2018-08-161-1/+0
|\
| * MDEV-16662 CMake warnings: CMP0026Sergei Golubchik2018-08-121-1/+0
* | MDEV-15473 Isolate/sandbox PAM modules, so that they can't crash the server.Alexey Botchkov2018-07-031-0/+1
|/
* Merge branch '10.2' into 10.3Sergei Golubchik2018-06-301-0/+7
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-0/+7
| |\
| | * 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
* | | | | .gitignoreSergei Golubchik2018-06-161-2/+2
* | | | | Merge branch 'github/10.2' into 10.3Sergei Golubchik2018-05-221-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | .gitignoreSergei Golubchik2018-05-201-0/+2
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-041-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-011-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Ignore generated file rdb_source_revision.hMonty2018-01-011-0/+1
* | | | | | Misc: updated .gitignoreAleksey Midenkov2017-12-151-0/+8
|/ / / / /
* | | | | ignore generated fileSergei Golubchik2017-09-231-0/+1
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-191-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | update .gitignoreAlexander Kuleshov2017-07-171-0/+4
* | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-0/+7
| |\ \ \ \ | | |/ / /
| | * | | .gitignore mariabackupSergei Golubchik2017-04-271-0/+3
| | * | | update gitignore with commonly used (by me) out-of-source builddir namesVladislav Vaintroub2017-04-271-0/+4
* | | | | Adding an alternative grammar file sql_yacc_ora.yy for sql_mode=ORACLEAlexander Barkov2017-04-051-0/+2
|/ / / /
* | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-04-041-0/+3
|\ \ \ \
| * \ \ \ Merge 10.1 into 10.2Marko Mäkelä2017-04-041-0/+3
| |\ \ \ \ | | |/ / /
| | * | | put all aws_key_management plugin files into plugin/aws_key_managementSergei Golubchik2017-03-311-0/+3
* | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocksSergei Petrunia2017-03-111-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-0/+2
| |\ \ \ \ | | |/ / /
| | * | | 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
| * | | | dgcov: import, rewrite to work with cmake and gitSergei Golubchik2017-01-111-0/+1
| * | | | Improve mysys/hash by caching hash_nrMonty2017-01-111-0/+1
| * | | | Fixes for running with gcovMonty2017-01-111-0/+2
* | | | | Update gitignore to not show rocksdb generated binariesVicențiu Ciorbaru2017-01-231-0/+3
|/ / / /
* | | | 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
| |/ / /
* | | | .gitignore for rpm buildsSergei Golubchik2016-09-041-1/+3
|/ / /
* | | - 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
|\ \ \ | |/ /