summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2001-09-19 14:39:11 -0600
committerunknown <sasha@mysql.sashanet.com>2001-09-19 14:39:11 -0600
commit30f4ea704431158f96163e7e62ad28a98164bbbf (patch)
tree79cfad2bba3d731b1adc961f57f00e92a10581f9 /.bzrignore
parent5dbd7397bd0d268b02d2aacb16b8c288fcfa2e93 (diff)
parentba2c3fcd6a4eacd1c09fbebd823c0efdeefeedac (diff)
downloadmariadb-git-30f4ea704431158f96163e7e62ad28a98164bbbf.tar.gz
merged
BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7: Auto merged include/Makefile.am: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged mysys/md5.c: Auto merged sql/Makefile.am: Auto merged
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore21
1 files changed, 11 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore
index bfb1710d33d..3282a9a0e85 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -152,6 +152,7 @@ client/mysqlbinlog
client/mysqlcheck
client/mysqldump
client/mysqlimport
+client/mysqlmanagerc
client/mysqlshow
client/mysqltest
client/mysys_priv.h
@@ -203,6 +204,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
@@ -402,13 +413,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