summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorMagnus Svensson <msvensson@mysql.com>2008-05-30 11:12:07 +0200
committerMagnus Svensson <msvensson@mysql.com>2008-05-30 11:12:07 +0200
commit867b60e08be9887aa6b7a61b763f44edcca1c221 (patch)
tree2c436ada208ddcfb89206130a251a9bc72631891 /.bzrignore
parentecc6795c45fc676dca657d4144cc5e5a6ec47e70 (diff)
parent14aef9781ad64ab89e1bf61ad8a09565f14f5147 (diff)
downloadmariadb-git-867b60e08be9887aa6b7a61b763f44edcca1c221.tar.gz
Merge 5.1->5.1-rpl
Fix paths and name of a few files to make it work with new mtr.pl
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore9
1 files changed, 9 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index 6646faa9a6f..350827bc864 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1288,6 +1288,8 @@ mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/lib/My/SafeProcess/my_safe_process
mysql-test/lib/init_db.sql
+mysql-test/linux_sys_vars.inc
+mysql-test/load_sysvars.inc
mysql-test/mtr
mysql-test/mysql-test-run
mysql-test/mysql-test-run-shell
@@ -1323,6 +1325,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
@@ -1400,6 +1403,7 @@ mysql-test/t/index_merge.load
mysql-test/t/tmp.test
mysql-test/var
mysql-test/var/*
+mysql-test/windows_sys_vars.inc
mysql.kdevprj
mysql.proj
mysql_priv.h
@@ -3021,3 +3025,8 @@ win/vs8cache.txt
ylwrap
zlib/*.ds?
zlib/*.vcproj
+mysql-test/bug36522-64.tar
+mysql-test/bug36522.tar
+mysql-test/t.log
+mysql-test/tps.log
+libmysqld/event_parse_data.cc