diff options
| author | monty@mysql.com <> | 2005-07-28 17:09:54 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-07-28 17:09:54 +0300 |
| commit | 15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c (patch) | |
| tree | efa95d21efbbc033b0cabce038118a09be44e9ac /.bzrignore | |
| parent | b3cbd0048fe5fe36fe4fba9ce591b0d1b26e10a1 (diff) | |
| parent | 3c12d0ae54eccaef7c265af4f782d95250308dc9 (diff) | |
| download | mariadb-git-15d48525afc66df10f8f4e68c0a33a4e3ef2ae8c.tar.gz | |
Merge mysql.com:/home/my/mysql-4.1
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore index 746f141bd42..2c20c4daf22 100644 --- a/.bzrignore +++ b/.bzrignore @@ -357,6 +357,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 +538,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 +641,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 +796,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 @@ -879,6 +883,7 @@ ndb/test/tools/hugoScanUpdate ndb/test/tools/ndb_cpcc ndb/test/tools/restart ndb/test/tools/verify_index +ndb/tools/ndb_config ndb/tools/ndb_delete_all ndb/tools/ndb_delete_all.dsp ndb/tools/ndb_desc @@ -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 |