diff options
| author | unknown <monty@mysql.com> | 2004-02-11 00:06:46 +0100 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-02-11 00:06:46 +0100 |
| commit | 5b2c3126277a8eedab5bcc8a9b0ce7386ccc3dbe (patch) | |
| tree | 927515d304bd661aebdb0e534418caf49d322ada /.bzrignore | |
| parent | dc792940232f3265e21905cb939853f4db5ebd16 (diff) | |
| parent | 65ec6a41b65f26552481be24ac8947c83eeea198 (diff) | |
| download | mariadb-git-5b2c3126277a8eedab5bcc8a9b0ce7386ccc3dbe.tar.gz | |
Merge with 4.0.18
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/ctype_tis620.result-old:
Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old
BUILD/compile-pentium-max:
Auto merged
BitKeeper/etc/config:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/Do-compile:
Auto merged
configure.in:
Auto merged
mysql-test/t/ctype_tis620.test-old:
Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old
Docs/Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/ibuf/ibuf0ibuf.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/ut0mem.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 7a3629883af..b8fac778709 100644 --- a/.bzrignore +++ b/.bzrignore @@ -74,6 +74,7 @@ Docs/safe-mysql.xml Docs/tex.fmt Docs/texi2dvi.out INSTALL-SOURCE +INSTALL-WIN-SOURCE Logs/* MIRRORS Makefile @@ -436,6 +437,7 @@ linked_libmysqldex_sources linked_server_sources linked_tools_sources locked +man/*.1 mit-pthreads/config.flags mit-pthreads/include/bits mit-pthreads/include/pthread/machdep.h @@ -458,6 +460,7 @@ myisam/mi_test2 myisam/mi_test3 myisam/mi_test_all myisam/myisam.log +myisam/myisam_ftdump myisam/myisamchk myisam/myisamlog myisam/myisampack @@ -640,4 +643,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -INSTALL-WIN-SOURCE |