diff options
| author | unknown <serg@serg.mylan> | 2004-11-11 13:44:10 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-11 13:44:10 +0100 |
| commit | f200533b3ee958571a12c9bce7e94a9ca53062d4 (patch) | |
| tree | 1d672204a1e6300782504f85980695c94ebc5b59 /.bzrignore | |
| parent | 57a8063f80bc840e8e996745871d89f704df3adb (diff) | |
| parent | 9723a143d0710edd2e97582c5de37e9a42c23f70 (diff) | |
| download | mariadb-git-f200533b3ee958571a12c9bce7e94a9ca53062d4.tar.gz | |
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
include/config-win.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 9fbb34e1f71..13524cf8125 100644 --- a/.bzrignore +++ b/.bzrignore @@ -537,6 +537,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 |