summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-05-06 14:40:32 +0200
committerSergei Golubchik <sergii@pisem.net>2014-05-06 14:40:32 +0200
commit7a0a2c4b849a38814db8aa996964268ff6aa0f6f (patch)
treef5d5584082c1e8bb167fecefec5dda47f7a1c220 /.bzrignore
parentaff4854dfd3667b58e73996a2710621efc468374 (diff)
downloadmariadb-git-7a0a2c4b849a38814db8aa996964268ff6aa0f6f.tar.gz
after tokudb-7.1.6 merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore8
1 files changed, 4 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore
index 4142df6575f..84ccfa2beff 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1415,7 +1415,7 @@ storage/tokudb/ft-index/portability/tests/try-uninit
storage/tokudb/ft-index/src/merge_archives_tokufractaltree_static.cmake
storage/tokudb/ft-index/src/tokufractaltree_static_depends.cc
storage/tokudb/ft-index/src/tests/recovery_fileops_unit_dir
-storage/tokudb/ft-index/toku_include/toku_config.h
+storage/tokudb/ft-index/portability/toku_config.h
storage/tokudb/ft-index/util/tests/marked-omt-test
storage/tokudb/ft-index/util/tests/omt-tmpl-test
storage/tokudb/ft-index/util/tests/sort-tmpl-test
@@ -1429,8 +1429,8 @@ storage/tokudb/ft-index/util/tests/test_partitioned_counter
storage/tokudb/ft-index/util/tests/test_partitioned_counter_5833
storage/tokudb/ft-index/util/tests/threadpool-test
storage/tokudb/ft-index/util/tests/threadpool-testrunf
-storage/tokudb/ft-index/utils/tokudb_dump
-storage/tokudb/ft-index/utils/tokudb_gen
-storage/tokudb/ft-index/utils/tokudb_load
+storage/tokudb/ft-index/tools/tokudb_dump
+storage/tokudb/ft-index/tools/tokudb_gen
+storage/tokudb/ft-index/tools/tokudb_load
libmysql/libmysql_versions.ld
scripts/mysql_config.pl