summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <monty@bitch.mysql.fi>2001-09-19 02:14:27 +0300
committerunknown <monty@bitch.mysql.fi>2001-09-19 02:14:27 +0300
commitf35000870705e558ed15ec93de3552ed6f111928 (patch)
tree196f85a79929fa6574201b640dd8b0a78ea1362e /.bzrignore
parenta8b37644ec4df7d7b80e107bdd0e88e07d56e5b2 (diff)
parent1869975881fd554006f45abd294729ec0c6c8031 (diff)
downloadmariadb-git-f35000870705e558ed15ec93de3552ed6f111928.tar.gz
Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0
BitKeeper/etc/ignore: auto-union
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore23
1 files changed, 13 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore
index bfb1710d33d..bdf6bee4488 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -203,6 +203,16 @@ libmysqld/backup_dir
libmysqld/convert.cc
libmysqld/derror.cc
libmysqld/errmsg.c
+libmysqld/examples/completion_hash.cc
+libmysqld/examples/completion_hash.h
+libmysqld/examples/my_readline.h
+libmysqld/examples/mysql
+libmysqld/examples/mysql.cc
+libmysqld/examples/mysqltest
+libmysqld/examples/mysqltest.c
+libmysqld/examples/readline.cc
+libmysqld/examples/sql_string.cc
+libmysqld/examples/sql_string.h
libmysqld/field.cc
libmysqld/field_conv.cc
libmysqld/filesort.cc
@@ -366,6 +376,9 @@ sql/lex_hash.h
sql/mini_client_errors.c
sql/mysqlbinlog
sql/mysqld
+sql/mysqld-purecov
+sql/mysqld-purify
+sql/mysqld-quantify
sql/share/*.sys
sql/share/charsets/gmon.out
sql/share/gmon.out
@@ -402,13 +415,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-libmysqld/examples/completion_hash.cc
-libmysqld/examples/completion_hash.h
-libmysqld/examples/my_readline.h
-libmysqld/examples/mysql.cc
-libmysqld/examples/mysqltest.c
-libmysqld/examples/readline.cc
-libmysqld/examples/sql_string.cc
-libmysqld/examples/sql_string.h
-libmysqld/examples/mysql
-libmysqld/examples/mysqltest