diff options
| author | unknown <monty@mysql.com> | 2004-11-09 21:47:46 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-11-09 21:47:46 +0200 |
| commit | 96bd70c7750aa2a9e39eaeb1da917f89f04173b9 (patch) | |
| tree | 50aeda8eac9d7305cd0eb80d8479f992cd179e02 /.bzrignore | |
| parent | 591feb1fbc3632da62620e81ac39e8a0e307aa84 (diff) | |
| parent | cd16e4c9c750a5bddfcecaa849dc277445aeaa5b (diff) | |
| download | mariadb-git-96bd70c7750aa2a9e39eaeb1da917f89f04173b9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
sql/item_subselect.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 94dad72acee..0e071d1343e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -296,6 +296,7 @@ extra/resolveip extra/tztime.cc fcns.c fcns.h +gdbinit gmon.out hardcopy.0 heap/hp_test1 @@ -519,6 +520,7 @@ mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz mysql-test/gmon.out mysql-test/install_test_db mysql-test/mysql-test-run +mysql-test/mysql_test_run_new mysql-test/ndb/ndbcluster mysql-test/r/*.reject mysql-test/r/index_merge_load.result @@ -939,4 +941,3 @@ vio/test-ssl vio/test-sslclient vio/test-sslserver vio/viotest-ssl -gdbinit |