diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-11 20:20:35 +0200 |
| commit | 810cf362eae28d4a096e0acea7efa67dd32aa05b (patch) | |
| tree | 4f7b2f858e8a57022e790bcac6d88b5e3451ee0f /.gitignore | |
| parent | a99efc00a68fe2406343e63b67fc4ea58bed345a (diff) | |
| parent | d199a0ffb0aac86881ea2db7dd78bc07b438dc67 (diff) | |
| download | mariadb-git-810cf362eae28d4a096e0acea7efa67dd32aa05b.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index e7871c66357..fc2d98c9be2 100644 --- a/.gitignore +++ b/.gitignore @@ -175,7 +175,6 @@ 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/tdb_logprint storage/tokudb/ft-index/ft/tokuftdump storage/tokudb/ft-index/portability/merge_archives_tokuportability_static.cmake storage/tokudb/ft-index/portability/toku_config.h @@ -186,11 +185,11 @@ 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/ support-files/MySQL-shared-compat.spec support-files/binary-configure |