diff options
author | Alexander Barkov <bar@mnogosearch.org> | 2014-10-02 15:48:20 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mnogosearch.org> | 2014-10-02 15:48:20 +0400 |
commit | 665ea7796f64e1bb1fcbdf7f9cb933e525b44c99 (patch) | |
tree | 7b68ac23bfd500bc1395f2c8d8fdf20cdb7dcfd8 /.bzrignore | |
parent | 44428d397cdb0da5456e885d8c3ebc559eebfe82 (diff) | |
parent | 8dbe3d81d44ed5c9df540e02ef18cbbc7d971c12 (diff) | |
download | mariadb-git-665ea7796f64e1bb1fcbdf7f9cb933e525b44c99.tar.gz |
Merge 10.0-mroonga -> 10.0
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 7542a1bff29..5a17d96936f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1188,6 +1188,17 @@ 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/tokuftdump +storage/mroonga/config.sh +storage/mroonga/mrn_version.h +storage/mroonga/data/install.sql +storage/mroonga/vendor/groonga/config.sh +storage/mroonga/vendor/groonga/groonga.pc +storage/mroonga/vendor/groonga/version.sh +storage/mroonga/vendor/groonga/src/grnslap +storage/mroonga/vendor/groonga/src/groonga +storage/mroonga/vendor/groonga/src/groonga-benchmark +storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset +storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql/groonga-normalizer-mysql.pc libmysql/libmysql_versions.ld scripts/mysql_config.pl pcre/pcre_chartables.c |