summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-11-09 21:47:46 +0200
committermonty@mysql.com <>2004-11-09 21:47:46 +0200
commit0ebc50b851744a2e6c048720492cd2372a30d123 (patch)
tree50aeda8eac9d7305cd0eb80d8479f992cd179e02 /.bzrignore
parente18ea590056b5d4764fbb4e58932e09713c935de (diff)
parent46089cfd144be3430f69e2a8b48b0aeee154d6fa (diff)
downloadmariadb-git-0ebc50b851744a2e6c048720492cd2372a30d123.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 94dad72acee..0e071d1343e 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -296,6 +296,7 @@ extra/resolveip
extra/tztime.cc
fcns.c
fcns.h
+gdbinit
gmon.out
hardcopy.0
heap/hp_test1
@@ -519,6 +520,7 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/mysql-test-run
+mysql-test/mysql_test_run_new
mysql-test/ndb/ndbcluster
mysql-test/r/*.reject
mysql-test/r/index_merge_load.result
@@ -939,4 +941,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-gdbinit