diff options
| author | unknown <istruewing@chilla.local> | 2006-09-20 08:33:46 +0200 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2006-09-20 08:33:46 +0200 |
| commit | f6951675f9246c7da71bb64c7058c494821ac01f (patch) | |
| tree | c5d55ac909d923b7567a72723ef59e8f30caa83c /.bzrignore | |
| parent | 186573b3d6301532b5d5fa9b470335e19f49769c (diff) | |
| parent | 82a72ee17e74db84b2c7a5ecfccf8a459c642acc (diff) | |
| download | mariadb-git-f6951675f9246c7da71bb64c7058c494821ac01f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into chilla.local:/home/mydev/mysql-4.1-bug14400-monty
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 4325a9177fa..c4ae17ed95e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,3 +1,5 @@ +*.Plo +*.Po *.a *.bb *.bbg @@ -11,6 +13,8 @@ *.reject *.spec */*_pure_*warnings +*/.deps +*/.libs/* */.pure *~ .*.swp @@ -336,6 +340,7 @@ isam/test2 isam/test3 libmysql/*.c libmysql/conf_to_src +libmysql/libmysql.ver libmysql/my_static.h libmysql/my_time.c libmysql/mysys_priv.h @@ -443,6 +448,7 @@ libmysqld/sql_insert.cc libmysqld/sql_lex.cc libmysqld/sql_list.cc libmysqld/sql_load.cc +libmysqld/sql_locale.cc libmysqld/sql_manager.cc libmysqld/sql_map.cc libmysqld/sql_olap.cc @@ -519,6 +525,7 @@ mysql-4.1.8-win-src.zip mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-test/gmon.out mysql-test/install_test_db +mysql-test/mtr mysql-test/mysql-test-run mysql-test/mysql-test-run.log mysql-test/mysql_test_run_new @@ -1057,6 +1064,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -libmysql/libmysql.ver -libmysqld/sql_locale.cc -mysql-test/mtr |