diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-10-10 17:18:11 +0300 |
| commit | 72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1 (patch) | |
| tree | 220c965bb467b020a4db171d7803586f9ed22cea /.bzrignore | |
| parent | cfbd9270243e4b429cdc26e8554bcc99690f2422 (diff) | |
| parent | 00a2f36bbf22a4d8b2367724e7919c0603cf6f71 (diff) | |
| download | mariadb-git-72dd7575cd8b9372ddb79cc4c94050e4ee1e5ee1.tar.gz | |
Merge 5.2->5.3
- Re-commit Monty's merge, partially fixed by Igor and SergeyP,
but still broken
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore index a38e39107f1..f49e2f72922 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1470,15 +1470,15 @@ storage/maria/ma_test1 storage/maria/ma_test2 storage/maria/ma_test3 storage/maria/ma_test_all -storage/maria/maria.log -storage/maria/maria_chk -storage/maria/maria_control -storage/maria/maria_dump_log -storage/maria/maria_ftdump -storage/maria/maria_log -storage/maria/maria_log.* -storage/maria/maria_pack -storage/maria/maria_read_log +storage/maria/aria.log +storage/maria/aria_chk +storage/maria/aria_control +storage/maria/aria_dump_log +storage/maria/aria_ftdump +storage/maria/aria_log +storage/maria/aria_log.* +storage/maria/aria_pack +storage/maria/aria_read_log storage/maria/tmp storage/maria/tmp/* storage/maria/unittest/ma_pagecache_consist_1k-t-big @@ -1941,3 +1941,5 @@ sql/client_plugin.c libmysqld/create_options.cc storage/pbxt/bin/xtstat libmysqld/sql_expression_cache.cc +mysql-test/mtr_command +scripts/convert-debug-for-diff |