diff options
| author | unknown <joerg@trift2.> | 2007-04-07 20:30:26 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-04-07 20:30:26 +0200 |
| commit | b77c664ea82bbd3286a750344e2dac5772d5423b (patch) | |
| tree | 27661120780424c1828d0aea6a7bc8b647932a1a /.bzrignore | |
| parent | be3bc128abb09641f0d03216101c4d6938af4245 (diff) | |
| parent | fb27844b0ff745503b6d877ae1a5b004e709c89d (diff) | |
| download | mariadb-git-b77c664ea82bbd3286a750344e2dac5772d5423b.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
BitKeeper/etc/ignore:
auto-union
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 55f55faa0e6..b5ec5aea79d 100644 --- a/.bzrignore +++ b/.bzrignore @@ -379,6 +379,7 @@ client/mysqltestmanager-pwgen client/mysqltestmanagerc client/mysys_priv.h client/readline.cpp +client/rpl_constants.h client/select_test client/sql_string.cpp client/ssl_test @@ -1347,10 +1348,15 @@ mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings mysql-test/suite/funcs_1/r/myisam_views.warnings mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings mysql-test/suite/funcs_1/r/ndb_views.warnings +mysql-test/suite/partitions/r/dif mysql-test/suite/partitions/r/diff +mysql-test/suite/partitions/r/partition.result mysql-test/suite/partitions/r/partition_bit_ndb.warnings mysql-test/suite/partitions/r/partition_special_innodb.warnings mysql-test/suite/partitions/r/partition_special_myisam.warnings +mysql-test/suite/partitions/r/partition_t55.out +mysql-test/suite/partitions/r/partition_t55.refout +mysql-test/suite/partitions/t/partition.test mysql-test/t/index_merge.load mysql-test/t/tmp.test mysql-test/var @@ -2956,4 +2962,3 @@ win/vs71cache.txt win/vs8cache.txt zlib/*.ds? zlib/*.vcproj -client/rpl_constants.h |