diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-19 14:45:54 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-19 14:45:54 +0400 |
| commit | 34668e10b2e0636b5e784ae76f0c5cba5e4eb732 (patch) | |
| tree | ee3c53f8348359ef9962ddd595d9634566fe7ee1 /.gitignore | |
| parent | d1af417eb87e244f635c0c076d47f3ed383e8380 (diff) | |
| parent | bc75c57cfc18be64f167d91c431076f581b0382b (diff) | |
| download | mariadb-git-34668e10b2e0636b5e784ae76f0c5cba5e4eb732.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 1a93c78b0e2..c4109b63dc2 100644 --- a/.gitignore +++ b/.gitignore @@ -131,6 +131,8 @@ scripts/wsrep_sst_xtrabackup scripts/wsrep_sst_xtrabackup-v2 scripts/maria_add_gis_sp.sql scripts/maria_add_gis_sp_bootstrap.sql +scripts/galera_new_cluster +scripts/galera_recovery sql-bench/bench-count-distinct sql-bench/bench-init.pl sql-bench/compare-results @@ -224,6 +226,7 @@ support-files/config.medium.ini support-files/config.small.ini support-files/mariadb.pc support-files/mariadb@.service +support-files/mariadb.service support-files/my-huge.cnf support-files/my-innodb-heavy-4G.cnf support-files/my-large.cnf @@ -237,6 +240,7 @@ support-files/mysqld_multi.server support-files/wsrep.cnf support-files/wsrep_notify support-files/policy/selinux/mysqld-safe.pp +support-files/mariadb.pp tags tests/async_queries tests/bug25714 |