diff options
| author | unknown <kostja@oak.local> | 2003-09-03 16:44:40 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-09-03 16:44:40 +0400 |
| commit | 15c0fe47bb9c7f7dc7372533460ef44864c5c894 (patch) | |
| tree | 587e6a4192d8412b3151db91a4afe407629cd500 /.bzrignore | |
| parent | 93c9f9c69ff12d765b4c119c3eee240db97cbea7 (diff) | |
| parent | d42b4eeb1dafcf6760b4d88bab0f68dad908b159 (diff) | |
| download | mariadb-git-15c0fe47bb9c7f7dc7372533460ef44864c5c894.tar.gz | |
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into oak.local:/home/kostja/mysql/mysql-4.1-root
BitKeeper/etc/ignore:
auto-union
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore index b28278f83a7..e4317a564a9 100644 --- a/.bzrignore +++ b/.bzrignore @@ -23,6 +23,7 @@ .vimrc 50 =6 +BUILD/compile-pentium-maintainer BitKeeper/etc/config BitKeeper/etc/csets BitKeeper/etc/csets-in @@ -30,6 +31,8 @@ BitKeeper/etc/csets-out BitKeeper/etc/gone BitKeeper/etc/level BitKeeper/etc/pushed +BitKeeper/post-commit +BitKeeper/post-commit-manual BitKeeper/tmp/* BitKeeper/tmp/bkr3sAHD BitKeeper/tmp/gone @@ -223,6 +226,7 @@ bkpull.log.5 bkpull.log.6 bkpush.log build.log +build_tags.sh client/insert_test client/log_event.cc client/log_event.h @@ -311,6 +315,8 @@ libmysql_r/conf_to_src libmysql_r/my_static.h libmysql_r/mysys_priv.h libmysqld/backup_dir +libmysqld/client.c +libmysqld/client_settings.h libmysqld/convert.cc libmysqld/derror.cc libmysqld/errmsg.c @@ -355,6 +361,7 @@ libmysqld/item_sum.cc libmysqld/item_timefunc.cc libmysqld/item_uniq.cc libmysqld/key.cc +libmysqld/libmysql.c libmysqld/lock.cc libmysqld/log.cc libmysqld/log_event.cc @@ -366,6 +373,7 @@ libmysqld/net_serv.cc libmysqld/opt_ft.cc libmysqld/opt_range.cc libmysqld/opt_sum.cc +libmysqld/pack.c libmysqld/password.c libmysqld/procedure.cc libmysqld/protocol.cc @@ -483,6 +491,7 @@ mysys/#mf_iocache.c# mysys/charset2html mysys/getopt.c mysys/getopt1.c +mysys/main.cc mysys/ste5KbMa mysys/test_charset mysys/test_dir @@ -586,6 +595,7 @@ stamp-h1 stamp-h2 stamp-h3 stamp-h4 +start_mysqld.sh strings/conf_to_src strings/ctype_autoconf.c strings/ctype_extra_sources.c @@ -612,6 +622,7 @@ support-files/mysql.spec tags test_xml tests/client_test +tests/connect_test thread_test tmp/* tools/my_vsnprintf.c @@ -623,7 +634,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysqld/client.c -libmysqld/client_settings.h -libmysqld/libmysql.c -libmysqld/pack.c |