diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-07 06:38:05 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-07 06:38:05 -0700 |
| commit | 3145787db91432deaaf51437855c06e7b26e8fe2 (patch) | |
| tree | 874410a623b21d2d3f837cc2e0e3c566f7a425be /.bzrignore | |
| parent | e5a97df6631a3ae9f2cc96eeeb4854593e3a79d4 (diff) | |
| parent | d499ead64c468cab0fb03b98568e01bfd971f7b3 (diff) | |
| download | mariadb-git-3145787db91432deaaf51437855c06e7b26e8fe2.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_key.c:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/item_buff.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore index b344b511251..ae028ae9426 100644 --- a/.bzrignore +++ b/.bzrignore @@ -102,6 +102,7 @@ Makefile.in Makefile.in' PENDING/* TAGS +VC++Files/client/mysql_amd64.dsp ac_available_languages_fragment acinclude.m4 aclocal.m4 @@ -274,6 +275,8 @@ client/mysqlmanager-pwgen client/mysqlmanagerc client/mysqlshow client/mysqltest +client/mysqltestmanager-pwgen +client/mysqltestmanagerc client/mysys_priv.h client/select_test client/ssl_test @@ -284,10 +287,12 @@ cmd-line-utils/libedit/common.h cmd-line-utils/libedit/makelist comon.h config.cache +config.guess config.h config.h.in config.log config.status +config.sub configure configure.lineno core @@ -355,6 +360,7 @@ innobase/ib_config.h.in innobase/stamp-h1 insert_test install +install-sh isam/isamchk isam/isamlog isam/pack_isam @@ -519,7 +525,9 @@ linked_libmysqldex_sources linked_server_sources linked_tools_sources locked +ltmain.sh man/*.1 +missing mit-pthreads/config.flags mit-pthreads/include/bits mit-pthreads/include/pthread/machdep.h @@ -936,6 +944,7 @@ scripts/mysqld_multi scripts/mysqld_safe scripts/mysqldumpslow scripts/mysqlhotcopy +scripts/mysqlhotcopy.sh.rej scripts/safe_mysqld select_test server-tools/instance-manager/client.c @@ -1100,18 +1109,10 @@ tmp/* tools/my_vsnprintf.c tools/mysqlmanager tools/mysqlmngd +tools/mysqltestmanager tools/mysys_priv.h vi.h vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -VC++Files/client/mysql_amd64.dsp -client/mysqltestmanager-pwgen -client/mysqltestmanagerc -tools/mysqltestmanager -config.guess -config.sub -install-sh -ltmain.sh -missing |