diff options
| author | unknown <joerg@trift2.> | 2007-02-09 12:08:41 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-02-09 12:08:41 +0100 |
| commit | 135d025687f01562f5edd33c83eff1aa3ad6b51d (patch) | |
| tree | d211fcd675c789e60cc2efa0ce1a6b9d1e11b373 /.bzrignore | |
| parent | 452038579bb821a815f7a838a69a2fd5a1c0d79c (diff) | |
| parent | fc71108a8b38125dd1a8e0affb617ee5867331ca (diff) | |
| download | mariadb-git-135d025687f01562f5edd33c83eff1aa3ad6b51d.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 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 09cb954bac8..837f331b0a6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1255,6 +1255,7 @@ mysql-test/mysql-test-run-shell mysql-test/mysql-test-run.log mysql-test/mysql_test_run_new mysql-test/ndb/ndbcluster +mysql-test/partitions.log mysql-test/r/*.err mysql-test/r/*.log mysql-test/r/*.out @@ -1334,8 +1335,21 @@ mysql-test/r/symlink.log mysql-test/r/system_mysql_db.log mysql-test/r/tmp.result mysql-test/r/udf.log +mysql-test/rpl.log mysql-test/share/mysql mysql-test/std_data/*.pem +mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings +mysql-test/suite/funcs_1/r/innodb_views.warnings +mysql-test/suite/funcs_1/r/memory_trig_03e.warnings +mysql-test/suite/funcs_1/r/memory_views.warnings +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/diff +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/t/index_merge.load mysql-test/t/tmp.test mysql-test/var |