summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorjoerg@trift2. <>2007-02-09 12:08:41 +0100
committerjoerg@trift2. <>2007-02-09 12:08:41 +0100
commite8669853b91b73df4ceb1421687a3b310f6738bc (patch)
treed211fcd675c789e60cc2efa0ce1a6b9d1e11b373 /.bzrignore
parent65c9dcc0114a88d78f0e67d176399c791c6c0c8d (diff)
parent816b8b419335277de2101539431dd55e6da36e7c (diff)
downloadmariadb-git-e8669853b91b73df4ceb1421687a3b310f6738bc.tar.gz
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore14
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