diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-02-13 10:00:53 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-02-13 10:00:53 +0100 |
| commit | e5c1656e978894d3c021ce4e702c9e03ef0fe7ca (patch) | |
| tree | d4957aedf39f381beff303c1a7bc5ddd2de6621e /.bzrignore | |
| parent | faacf58091aa31878f0e9b6a470a5adcc83a49d2 (diff) | |
| parent | 2abc977de9e0c4bbee7786ff18b3be5accf0fd4b (diff) | |
| download | mariadb-git-e5c1656e978894d3c021ce4e702c9e03ef0fe7ca.tar.gz | |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 9e1ff120a6c..ac692af1db1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -698,6 +698,7 @@ mysql-test/gmon.out mysql-test/install_test_db mysql-test/mtr mysql-test/mysql-test-run +mysql-test/mysql-test-run-shell mysql-test/mysql-test-run.log mysql-test/mysql_test_run_new mysql-test/ndb/ndbcluster @@ -967,6 +968,7 @@ ndb/src/kernel/error/liberror.dsp ndb/src/kernel/ndbd ndb/src/kernel/ndbd.dsp ndb/src/kernel/vm/libkernel.dsp +ndb/src/libndb.ver ndb/src/libndbclient.dsp ndb/src/mgmapi/libmgmapi.dsp ndb/src/mgmclient/libndbmgmclient.dsp @@ -1333,4 +1335,3 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj -ndb/src/libndb.ver |