diff options
| author | unknown <ingo@mysql.com> | 2004-04-07 14:56:24 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2004-04-07 14:56:24 +0200 |
| commit | cc168fc6fdb2299d568944c5265ec8787445ec4f (patch) | |
| tree | d67591428ccd76b55914906b3a2c65c7a878c8b9 /.bzrignore | |
| parent | 0948f9769b3e3da2e064e65015b86644af4acd78 (diff) | |
| parent | 03044fe20463f44c64b3ff8580972b3dbe874301 (diff) | |
| download | mariadb-git-cc168fc6fdb2299d568944c5265ec8787445ec4f.tar.gz | |
Hand-resolved auto merge
BitKeeper/etc/ignore:
auto-union
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/unireg.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Hand-merged
sql/sql_yacc.yy:
Hand-merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.bzrignore b/.bzrignore index a056e90b810..4c6b2a8a2d5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -250,6 +250,7 @@ client/thimble client/thread_test client_test cmd-line-utils/libedit/common.h +cmd-line-utils/libedit/makelist comon.h config.cache config.h @@ -300,6 +301,7 @@ innobase/ib_config.h innobase/ib_config.h.in innobase/stamp-h1 insert_test +install isam/isamchk isam/isamlog isam/pack_isam @@ -504,6 +506,7 @@ mysys/main.cc mysys/ste5KbMa mysys/test_charset mysys/test_dir +mysys/test_gethwaddr mysys/test_io_cache mysys/test_thr_alarm mysys/test_thr_lock @@ -646,5 +649,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -mysys/test_gethwaddr -cmd-line-utils/libedit/makelist |