diff options
author | unknown <msvensson@pilot.mysql.com> | 2007-02-13 10:00:59 +0100 |
---|---|---|
committer | unknown <msvensson@pilot.mysql.com> | 2007-02-13 10:00:59 +0100 |
commit | df1aaedfad0260a257ea27f6d5367e2df0f553b9 (patch) | |
tree | 8049a7023e6327fef1e576afa11105fc93c92676 /.bzrignore | |
parent | 62e80ed5f511841ae7ffd273224fb7edd5a2a108 (diff) | |
parent | 338691714237a99337802953b0bfe2f9fb11fdc7 (diff) | |
download | mariadb-git-df1aaedfad0260a257ea27f6d5367e2df0f553b9.tar.gz |
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.1
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
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 c4ccbfd4a3c..58ec0a63c17 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 |