diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-05-22 11:47:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-05-22 11:47:09 +0200 |
| commit | 4ec8598c1dcb63499bce998142b8e5b8b09b2d30 (patch) | |
| tree | 23010dcb3489b54b4bc9b26481a4a16a4378914a /.gitignore | |
| parent | fe3bf136b6cf83aac5a6e21d3db1c4e821612017 (diff) | |
| parent | afe5a51c2df95aa282e4459afeb7f037563def92 (diff) | |
| download | mariadb-git-4ec8598c1dcb63499bce998142b8e5b8b09b2d30.tar.gz | |
Merge branch 'github/10.2' into 10.3
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 718befa962d..932c666b74a 100644 --- a/.gitignore +++ b/.gitignore @@ -220,6 +220,8 @@ storage/tokudb/PerconaFT/tools/tokudb_load storage/tokudb/PerconaFT/tools/tokuftdump storage/tokudb/PerconaFT/tools/tokuft_logprint storage/tokudb/PerconaFT/xz/ +storage/tokudb/tokudb.cnf +storage/tokudb/tokudb.conf strings/conf_to_src support-files/MySQL-shared-compat.spec support-files/binary-configure |