summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-05-05 08:53:52 +0200
committerSergei Golubchik <serg@mariadb.org>2015-05-05 08:53:52 +0200
commitdd0207bda440c2e44ba5223d0635538bc2974890 (patch)
tree960b370c6b3d4220018346ecfd688cbb2cd390f0
parentd08b7ed5140dd7ee9b286aa8675cefff1eadfcd2 (diff)
downloadmariadb-git-dd0207bda440c2e44ba5223d0635538bc2974890.tar.gz
.gitignore: add generated mroonga *.result files
and remove duplicates
-rw-r--r--.gitignore18
1 files changed, 2 insertions, 16 deletions
diff --git a/.gitignore b/.gitignore
index e3df21eb17b..768872b9064 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,8 @@
-# Edited by Olivier Bertrand
*-t
-*.a
*.ctest
-*.o
*.reject
-*.so
-*.so.*
*.spec
-*~
*.bak
-*.log
.*.swp
*.ninja
.ninja_*
@@ -19,7 +12,6 @@ typescript
CMakeCache.txt
CMakeFiles/
MakeFile
-cmake_install.cmake
install_manifest.txt
CPackConfig.cmake
CPackSourceConfig.cmake
@@ -199,10 +191,6 @@ 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/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/xz/
support-files/MySQL-shared-compat.spec
support-files/binary-configure
@@ -236,11 +224,12 @@ 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/mysql-test/mroonga/storage/r/information_schema_plugins.result
+storage/mroonga/mysql-test/mroonga/storage/r/variable_version.result
# C and C++
# Compiled Object files
*.slo
-*.lo
*.o
*.ko
*.obj
@@ -280,7 +269,6 @@ storage/mroonga/vendor/groonga/src/suggest/groonga-suggest-create-dataset
*.user
*.userosscache
*.sln.docstates
-*.ncb
*.sln
*.vcproj
@@ -321,8 +309,6 @@ dlldata.c
*_i.h
*.ilk
*.meta
-*.obj
-*.pch
*.pdb
*.pgc
*.pgd