summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorigor@rurik.mysql.com <>2004-10-09 10:34:13 -0700
committerigor@rurik.mysql.com <>2004-10-09 10:34:13 -0700
commit71f6ab7a09fa8cb225315f74caae6b507af9a029 (patch)
tree84324c7af32f54d423310e3a2ee3255f7f43749b /.bzrignore
parent80d2d8d662d9e3db96295d831358a5d633a3c2eb (diff)
parent0dcc255b9b64df1767091c438678049cc1acdd7e (diff)
downloadmariadb-git-71f6ab7a09fa8cb225315f74caae6b507af9a029.tar.gz
Merge for Item_equal.
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 1feab85d33d..c55cf547450 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -508,6 +508,7 @@ mysql-test/install_test_db
mysql-test/mysql-test-run
mysql-test/ndb/ndbcluster
mysql-test/r/*.reject
+mysql-test/r/index_merge_load.result
mysql-test/r/rpl000001.eval
mysql-test/r/rpl000002.eval
mysql-test/r/rpl000014.eval
@@ -518,6 +519,7 @@ mysql-test/r/slave-running.eval
mysql-test/r/slave-stopped.eval
mysql-test/share/mysql
mysql-test/std_data/*.pem
+mysql-test/t/index_merge.load
mysql-test/var/*
mysql.kdevprj
mysql.proj