diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 20:13:09 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-15 20:13:09 +0100 |
| commit | 15f7f5c6bb4eb8ee8d868bb991f25b18d36f64ec (patch) | |
| tree | f34ee89e970d980124ce8390550e0845e1c52dc4 /.gitignore | |
| parent | a75ac82c2f24a6a7ffb2effe90455d367913b78d (diff) | |
| parent | 2c8c65297865d9f8da501761f46e2a34e29af603 (diff) | |
| download | mariadb-git-15f7f5c6bb4eb8ee8d868bb991f25b18d36f64ec.tar.gz | |
Merge branch 'merge-tokudb-5.6' into 10.0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore index cb6b24cae51..4e22c2bf532 100644 --- a/.gitignore +++ b/.gitignore @@ -166,31 +166,32 @@ storage/myisam/myisamlog storage/myisam/myisampack storage/myisam/rt_test storage/myisam/sp_test -storage/tokudb/ft-index/buildheader/db.h -storage/tokudb/ft-index/buildheader/make_tdb -storage/tokudb/ft-index/buildheader/runcat.sh -storage/tokudb/ft-index/ft/log_code.cc -storage/tokudb/ft-index/ft/log_header.h -storage/tokudb/ft-index/ft/log_print.cc -storage/tokudb/ft-index/ft/logformat -storage/tokudb/ft-index/ft/ftverify -storage/tokudb/ft-index/ft/tdb-recover -storage/tokudb/ft-index/ft/tokuftdump -storage/tokudb/ft-index/portability/merge_archives_tokuportability_static.cmake -storage/tokudb/ft-index/portability/toku_config.h -storage/tokudb/ft-index/portability/tokuportability_static_depends.cc -storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake -storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc -storage/tokudb/ft-index/toku_include/toku_config.h -storage/tokudb/ft-index/tools/ba_replay -storage/tokudb/ft-index/tools/ftverify -storage/tokudb/ft-index/tools/tdb-recover -storage/tokudb/ft-index/tools/tokudb_dump -storage/tokudb/ft-index/tools/tokudb_gen -storage/tokudb/ft-index/tools/tokudb_load -storage/tokudb/ft-index/tools/tokuftdump -storage/tokudb/ft-index/tools/tokuft_logprint -storage/tokudb/ft-index/xz/ +storage/tokudb/PerconaFT/buildheader/db.h +storage/tokudb/PerconaFT/buildheader/make_tdb +storage/tokudb/PerconaFT/buildheader/runcat.sh +storage/tokudb/PerconaFT/ft/log_code.cc +storage/tokudb/PerconaFT/ft/log_header.h +storage/tokudb/PerconaFT/ft/log_print.cc +storage/tokudb/PerconaFT/ft/logformat +storage/tokudb/PerconaFT/ft/ftverify +storage/tokudb/PerconaFT/ft/tdb-recover +storage/tokudb/PerconaFT/ft/tokuftdump +storage/tokudb/PerconaFT/portability/merge_archives_tokuportability_static.cmake +storage/tokudb/PerconaFT/portability/toku_config.h +storage/tokudb/PerconaFT/portability/tokuportability_static_depends.cc +storage/tokudb/PerconaFT/snappy/ +storage/tokudb/PerconaFT/src/merge_archives_tokufractaltree_static.cmake +storage/tokudb/PerconaFT/src/tokufractaltree_static_depends.cc +storage/tokudb/PerconaFT/toku_include/toku_config.h +storage/tokudb/PerconaFT/tools/ba_replay +storage/tokudb/PerconaFT/tools/ftverify +storage/tokudb/PerconaFT/tools/tdb-recover +storage/tokudb/PerconaFT/tools/tokudb_dump +storage/tokudb/PerconaFT/tools/tokudb_gen +storage/tokudb/PerconaFT/tools/tokudb_load +storage/tokudb/PerconaFT/tools/tokuftdump +storage/tokudb/PerconaFT/tools/tokuft_logprint +storage/tokudb/PerconaFT/xz/ support-files/MySQL-shared-compat.spec support-files/binary-configure support-files/config.huge.ini |