diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 17:01:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-04 17:01:00 +0200 |
| commit | a2fc36989e13c6f322fd22791f67e0d1275461d7 (patch) | |
| tree | 9cba675c50883e2e45c61a94b631d8875d16ddf9 /.gitignore | |
| parent | 82da98556cf58f0fbb43c82e9c6ae1a887b6cf3d (diff) | |
| parent | 74d648db12e100c628548fb2e5aa67de718bd1fb (diff) | |
| download | mariadb-git-a2fc36989e13c6f322fd22791f67e0d1275461d7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b6acd58bab0..31bd651a049 100644 --- a/.gitignore +++ b/.gitignore @@ -193,8 +193,8 @@ storage/myisam/sp_test storage/rocksdb/ldb storage/rocksdb/myrocks_hotbackup storage/rocksdb/mysql_ldb -storage/rocksdb/sst_dump storage/rocksdb/rdb_source_revision.h +storage/rocksdb/sst_dump storage/tokudb/PerconaFT/buildheader/db.h storage/tokudb/PerconaFT/buildheader/make_tdb storage/tokudb/PerconaFT/buildheader/runcat.sh |