diff options
| author | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
|---|---|---|
| committer | Guilhem Bichot <guilhem@mysql.com> | 2009-04-01 11:34:52 +0200 |
| commit | c71aae73f6f864c97cf17b3e872346666b871c3f (patch) | |
| tree | 4895816aee1a0fcef08daa0f68bf1b1fe9aa2b5a /.bzrignore | |
| parent | 3c59ba32ab9cca29e01bd8dd2130af83ead8bde0 (diff) | |
| parent | 7ca1ebd83a1a7d291593be7a94f5a37298dfc863 (diff) | |
| download | mariadb-git-c71aae73f6f864c97cf17b3e872346666b871c3f.tar.gz | |
merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except
those of davi.arnaut@sun.com-20090219210935-9vilvcisyyieffxl (TODO).
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index d22056caf01..7c8266ffe05 100644 --- a/.bzrignore +++ b/.bzrignore @@ -754,6 +754,8 @@ mysql-test/linux_sys_vars.inc mysql-test/load_sysvars.inc mysql-test/mtr mysql-test/mysql-test-run +mysql-test/mysql-test-gcov.err +mysql-test/mysql-test-gcov.msg mysql-test/mysql-test-run-shell mysql-test/mysql-test-run.log mysql-test/mysql_test_run_new |