summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorhhunger@hh-nb.hungers <>2008-04-23 11:59:31 +0200
committerhhunger@hh-nb.hungers <>2008-04-23 11:59:31 +0200
commit0d6209a5a20b4439799ce2a7cef7be515250235c (patch)
treedea90206194b39cb2d43626a7521b6331a15143b /.bzrignore
parent769f45f9bdd482f40f943a28b2f0c3073eb17bca (diff)
parent0e5e67e6fe6c1846249dfb1bfc22875d375e7442 (diff)
downloadmariadb-git-0d6209a5a20b4439799ce2a7cef7be515250235c.tar.gz
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 34980e4ae00..16386496643 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1324,6 +1324,7 @@ mysql-test/r/im_client_port.log
mysql-test/r/index_merge_load.result
mysql-test/r/isam.err
mysql-test/r/lowercase_table2.err
+mysql-test/r/max_allowed_packet_func.result
mysql-test/r/multi_update.err
mysql-test/r/mysql_protocols.err
mysql-test/r/mysqlbinlog.err