diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-03-11 20:12:15 +0000 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-03-11 20:12:15 +0000 |
| commit | 5b30c7896e8514b29dba0909272cda49910243ae (patch) | |
| tree | 9f4213363cb529795ae15fdb00b3e4f6ecd72ed5 /.gitignore | |
| parent | 5c1c2f67ec9373f55f9b69bdaf4adad416e4788b (diff) | |
| parent | eded6243bc4796ab44e70403edd059d32225f589 (diff) | |
| download | mariadb-git-5b30c7896e8514b29dba0909272cda49910243ae.tar.gz | |
Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f5f23da655f..366842b24be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.reject *.spec *.bak +*.dgcov *.rpm .*.swp *.ninja @@ -50,6 +51,7 @@ extra/jemalloc/build/ extra/jemalloc/tmp/ extra/my_print_defaults extra/mysql_waitpid +extra/mysqld_safe_helper extra/perror extra/replace extra/resolve_stack_dump @@ -80,6 +82,9 @@ mysql-test/lib/My/SafeProcess/my_safe_process mysql-test/mtr mysql-test/mysql-test-run mysql-test/var +mysql-test-gcov.err +mysql-test-gcov.msg +mysys/test_hash mysys/thr_lock mysys/thr_timer packaging/rpm-oel/mysql.spec @@ -223,6 +228,7 @@ support-files/mysql.spec support-files/mysqld_multi.server support-files/wsrep.cnf support-files/wsrep_notify +support-files/policy/selinux/mysqld-safe.pp tags tests/async_queries tests/bug25714 |