summaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Oleksandr Byelkin2020-02-111-0/+2
|\
| * Merge 10.2 into 10.3Marko Mäkelä2020-01-311-0/+2
| |\
| | * Merge 10.1 into 10.2Marko Mäkelä2020-01-311-0/+2
| | |\
| | | * Ingore sysusers and tmpfiles artifactsVicențiu Ciorbaru2020-01-281-0/+2
| | | |
| | * | Fixed dependency checking in some Galera testsJulius Goryavsky2019-07-181-0/+1
| | | |
| * | | wsrep_check_version binary is added to .gitignoreJulius Goryavsky2019-07-181-0/+1
| | | |
* | | | git ignore generated stuffVladislav Vaintroub2019-12-121-0/+32
| | | |
* | | | Fixed that mariadb-# binaries reads their corresponding entry from my.cnfMonty2019-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added mariadb-# to load_default_groups to all mariadb-# scripts and mariadb-binaries. - Added mariadbd and mariadbd-"version" to load_default_groups for the mysqld/mariadb server - Added mariadb-client to load_default_groups for the mysql/mariadb client Other things - Ignored mysql-test/lib/My/SafeProcess/wsrep_check_version - mysql_install_db will now automatically detect if run from srcdir
* | | | MDEV-17592 Create MariaDB named commands/symlinksSergei Golubchik2019-06-171-0/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | post-merge fixes: * .gitignore * don't put the keyword COMPONENT into ${COMP} anymore * don't alias mytop, but do alias mysql_client_test * don't symlink manpages, use troff aliasing technique instead (symlinked manpages break rpm and out-of-source bintar builds) * move debian to use troff aliased manpages, fix typos in debian files, put aliases in the correct packages, add more aliases to match rpm/bintar packaging
* | | | Use generated user_settings.h for WolfSSL, as recommended by WolfSSLVladislav Vaintroub2019-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation Apparently, WolfSSL wants to have *exactly* the same defines for the user of the library as the was when building library itself. A lot of #defines have an impact on ABI (structure sizes, alignment etc)
* | | | Add Clion folder to gitignore (#928)Andrey2019-03-231-0/+4
| | | |
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-201-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MDEV-17262 commit 26432e49d37a37d09b862bb49a021e44bdf4789c was skipped. In Galera 4, the implementation would seem to require changes to the streaming replication. In the tests archive.rnd_pos main.profiling, disable_ps_protocol for SHOW STATUS and SHOW PROFILE commands until MDEV-18974 has been fixed.
| * | | Ignore VScode workspaceAnel Husakovic2019-03-131-0/+3
| | | |
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-061-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-03-041-1/+1
| |\ \ \ | | |/ /
| | * | .gitignoreSergei Golubchik2019-03-011-1/+2
| | | |
| * | | Added generated wsrep_xxx files to .gitignoreMonty2019-02-061-0/+2
| | | |
* | | | Merge branch '10.3' into 10.4Sergei Golubchik2019-01-261-0/+1
|\ \ \ \ | |/ / /
| * | | Make the PYTHON_SHEBANG value configurableSergei Golubchik2019-01-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | and gitignore myrocks_hotbackup (as it's now generated) Closes #1081
* | | | Ignore some new executablesMichael Widenius2019-01-141-0/+3
| | | |
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-01-061-2/+0
|\ \ \ \ | |/ / /
| * | | DEV-17835: Remove wsrep-sst-method=xtrabackupJulius Goryavsky2018-12-171-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of the xtrabackup and xtrabackup-v2 methods for SST has been declared obsolete since version 10.2, now it cannot be used because of the different redo log format. Accordingly, we need to remove the xtrabackup-related scripts and dynamically replace the call to xtrabackup[-v2] to the mariabackup (with a corresponding warning in the log) when the server performs SST. https://jira.mariadb.org/browse/MDEV-17835
* | | | Added API for copying aria tables in mariabackupMonty2018-12-091-0/+1
| | | |
* | | | Merge 10.3 into 10.4Marko Mäkelä2018-11-061-0/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2018-11-061-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | main.derived_cond_pushdown: Move all 10.3 tests to the end, trim trailing white space, and add an "End of 10.3 tests" marker. Add --sorted_result to tests where the ordering is not deterministic. main.win_percentile: Add --sorted_result to tests where the ordering is no longer deterministic.
| | * | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-0/+1
| | |\ \ | | | |/
| | | * 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 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
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | New version of PAM plugin (v2.0) added along with the old v1.0. There the pam module is isolated in the auth_pam_tool application so cannot crash the server.
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently galera has capability of using delta transfer algorithm (rsync) for SST. But for using delta transfer we have change/copy wsrep_sst_rsync wsrep_sst_rsync_wan. This patch creates a symbolic link of wsrep_sst_rsync_wan to wsrep_sst_rsync.
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | after 4461b0f9b30
* | | | | 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
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/make_dist.cmake.in mysql-test/r/func_json.result mysql-test/r/ps.result mysql-test/t/func_json.test mysql-test/t/ps.test sql/item_cmpfunc.h
| | * | | | Ignore generated file rdb_source_revision.hMonty2018-01-011-0/+1
| | | | | |
View Lorry Controller Status