diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-17 02:35:16 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-17 04:16:38 +0200 |
| commit | 1e192e901ccf34454967cc3f62a71432c50f2c88 (patch) | |
| tree | d58eaa3ddcd6b1427630dd959737f9ae5eb965df /.gitignore | |
| parent | d807e41511c92a1497f8550fdee6557eb856218a (diff) | |
| download | mariadb-git-1e192e901ccf34454967cc3f62a71432c50f2c88.tar.gz | |
Post merge review fixes
* Remove duplicate lines from tests
* Use thd instead of current_thd
* Remove extra wsrep_binlog_format_names
* Correctly merge union patch from 5.5 wrt duplicate rows.
* Correctly merge SELinux changes into 10.1
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index c76b08477c9..5d882f268ff 100644 --- a/.gitignore +++ b/.gitignore @@ -218,7 +218,7 @@ support-files/mysql.spec support-files/mysqld_multi.server support-files/wsrep.cnf support-files/wsrep_notify -support-files/SELinux/centos6-mariadb.pp +support-files/policy/selinux/mysqld-safe.pp tags tests/async_queries tests/bug25714 |