summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2005-02-09 16:34:03 +0400
committerunknown <hf@deer.(none)>2005-02-09 16:34:03 +0400
commit0dcbd0704c85358eabf9adf83d1266281a86a094 (patch)
treeca5d127200d6cf9b655b0a55e0bf21545ed495e2 /.bzrignore
parent740eb50ff0c53e32386027935b545e901d728861 (diff)
parent93624f3c3d96d16b5448f5356cf61b1209ffdc65 (diff)
downloadmariadb-git-0dcbd0704c85358eabf9adf83d1266281a86a094.tar.gz
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean BitKeeper/etc/ignore: auto-union
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore16
1 files changed, 8 insertions, 8 deletions
diff --git a/.bzrignore b/.bzrignore
index b6b5d0a613f..f3f7ce94449 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -254,11 +254,14 @@ bkpush.log
bkpush.log*
build.log
build_tags.sh
+client/decimal.c
client/insert_test
client/log_event.cc
client/log_event.h
client/mf_iocache.c
client/mf_iocache.cc
+client/my_decimal.cc
+client/my_decimal.h
client/mysql
client/mysqladmin
client/mysqladmin.c
@@ -328,9 +331,12 @@ help.h
include/my_config.h
include/my_global.h
include/mysql_version.h
+include/mysqld_ername.h
+include/mysqld_error.h
include/readline
include/readline/*.h
include/readline/readline.h
+include/sql_state.h
include/widec.h
innobase/autom4te-2.53.cache/*
innobase/autom4te-2.53.cache/output.0
@@ -432,6 +438,7 @@ libmysqld/log_event.cc
libmysqld/md5.c
libmysqld/mf_iocache.cc
libmysqld/mini_client.cc
+libmysqld/my_decimal.cc
libmysqld/my_time.c
libmysqld/net_pkg.cc
libmysqld/net_serv.cc
@@ -985,6 +992,7 @@ support-files/mysql-3.23.29-gamma.spec
support-files/mysql-log-rotate
support-files/mysql.server
support-files/mysql.spec
+support-files/ndb-config-2-node.ini
tags
test/ndbapi/bank/bankCreator
test/ndbapi/bank/bankMakeGL
@@ -1052,11 +1060,3 @@ vio/test-ssl
vio/test-sslclient
vio/test-sslserver
vio/viotest-ssl
-include/mysqld_ername.h
-include/mysqld_error.h
-include/sql_state.h
-support-files/ndb-config-2-node.ini
-client/decimal.c
-client/my_decimal.cc
-client/my_decimal.h
-libmysqld/my_decimal.cc