diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-12-21 21:24:22 +0100 |
| commit | a2bcee626d4ef2836e38e4932305871390164644 (patch) | |
| tree | b41e357427318bad8985078b91bbd2b0360defc8 /.gitignore | |
| parent | 1788bfe93a745582d938a608d5959b7d2e6b2f23 (diff) | |
| parent | 4fdf25afa8188905653a83e08fc387243e584600 (diff) | |
| download | mariadb-git-a2bcee626d4ef2836e38e4932305871390164644.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore index 3c7fdf55015..92c58cc781e 100644 --- a/.gitignore +++ b/.gitignore @@ -166,32 +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/tdb_logprint -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 |