diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
| commit | 2195bb4e416232ab807ff67eecf03b1223bf6bff (patch) | |
| tree | 4555af02df68cb0f26d454b1cf65086b62542875 /.gitignore | |
| parent | 3ae038b732ce503fb839e9095355e05f5c6866f9 (diff) | |
| parent | bc4686f0f4d17dc57dd727c9f5390caa3022bdca (diff) | |
| download | mariadb-git-2195bb4e416232ab807ff67eecf03b1223bf6bff.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 737528ffdd4..9fd9637d7ef 100644 --- a/.gitignore +++ b/.gitignore @@ -51,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 @@ -224,6 +225,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 |