diff options
| author | unknown <jan@hundin.mysql.fi> | 2005-07-20 13:47:05 +0300 |
|---|---|---|
| committer | unknown <jan@hundin.mysql.fi> | 2005-07-20 13:47:05 +0300 |
| commit | 373a8703e8885032cf3ac528463d288c7733f7d2 (patch) | |
| tree | 515980c6ce1aaefdd34fc34e0e11e1027a9995e9 /.bzrignore | |
| parent | b6823b66922c8ea7325541a8c7c132e9027fa412 (diff) | |
| parent | 6c08c1176f3c5ae43fd8f178922c477a7edf7c9a (diff) | |
| download | mariadb-git-373a8703e8885032cf3ac528463d288c7733f7d2.tar.gz | |
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/new/mysql-5.0
BitKeeper/etc/ignore:
auto-union
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore index 746f141bd42..195867d6f97 100644 --- a/.bzrignore +++ b/.bzrignore @@ -312,6 +312,7 @@ emacs.h extra/charset2html extra/comp_err extra/created_include_files +extra/innochecksum extra/my_print_defaults extra/mysql_install extra/mysql_tzinfo_to_sql @@ -357,6 +358,7 @@ innobase/conftest.s1 innobase/conftest.subs innobase/ib_config.h innobase/ib_config.h.in +innobase/mkinstalldirs innobase/stamp-h1 insert_test install @@ -537,6 +539,7 @@ mit-pthreads/machdep.c mit-pthreads/pg++ mit-pthreads/pgcc mit-pthreads/syscall.S +mkinstalldirs myisam/FT1.MYD myisam/FT1.MYI myisam/ft_dump @@ -639,6 +642,7 @@ mysql-test/r/slave-stopped.eval mysql-test/share/mysql mysql-test/std_data/*.pem mysql-test/t/index_merge.load +mysql-test/var mysql-test/var/* mysql.kdevprj mysql.proj @@ -793,6 +797,7 @@ ndb/src/common/portlib/libportlib.dsp ndb/src/common/transporter/libtransporter.dsp ndb/src/common/util/libgeneral.dsp ndb/src/cw/cpcd/ndb_cpcd +ndb/src/dummy.cpp ndb/src/kernel/blocks/backup/libbackup.dsp ndb/src/kernel/blocks/backup/restore/ndb_restore ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp @@ -1116,7 +1121,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -ndb/src/dummy.cpp -innobase/mkinstalldirs -mkinstalldirs -mysql-test/var |