diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-04-05 15:05:10 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-04-05 15:05:10 +0300 |
| commit | 5bef77a33b79e62327348e9878cec2eb3212273c (patch) | |
| tree | 5b67d8cb58129c53647524366a12d5b054e61c2e /.bzrignore | |
| parent | 1a77ebd14c5ba2244db4b515c367e62bf97e8d8e (diff) | |
| parent | 0abffa05a60e3fccb31a81828fdc99986ce4b7c5 (diff) | |
| download | mariadb-git-5bef77a33b79e62327348e9878cec2eb3212273c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
mysql-test/lib/init_db.sql:
Auto merged
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_diff.pl:
Auto merged
mysql-test/lib/mtr_gcov.pl:
Auto merged
mysql-test/lib/mtr_gprof.pl:
Auto merged
mysql-test/lib/mtr_im.pl:
Auto merged
mysql-test/lib/mtr_io.pl:
Auto merged
mysql-test/lib/mtr_match.pl:
Auto merged
mysql-test/lib/mtr_misc.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/lib/mtr_stress.pl:
Auto merged
mysql-test/lib/mtr_timer.pl:
Auto merged
mysql-test/lib/mtr_unique.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_table.cc:
Auto merged
storage/maria/ha_maria.h:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_blockrec.h:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_checksum.c:
Auto merged
storage/maria/ma_create.c:
Auto merged
storage/maria/ma_delete.c:
Auto merged
storage/maria/ma_delete_all.c:
Auto merged
storage/maria/ma_extra.c:
Auto merged
storage/maria/ma_info.c:
Auto merged
storage/maria/ma_search.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_def.h:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_test2.c:
Auto merged
sql/share/errmsg.txt:
Use remote version
mysql-test/include/varchar.inc:
Manual merge (take changes from remote tree)
storage/maria/ha_maria.cc:
Manual merge
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 297338d08dc..cd469d20721 100644 --- a/.bzrignore +++ b/.bzrignore @@ -2401,6 +2401,15 @@ storage/maria/maria_ftdump storage/maria/maria_log storage/maria/maria_pack storage/maria/unittest/maria_control +storage/maria/unittest/mf_pagecache_consist_1k-t-big +storage/maria/unittest/mf_pagecache_consist_1kHC-t-big +storage/maria/unittest/mf_pagecache_consist_1kRD-t-big +storage/maria/unittest/mf_pagecache_consist_1kWR-t-big +storage/maria/unittest/mf_pagecache_consist_64k-t-big +storage/maria/unittest/mf_pagecache_consist_64kHC-t-big +storage/maria/unittest/mf_pagecache_consist_64kRD-t-big +storage/maria/unittest/mf_pagecache_consist_64kWR-t-big +storage/maria/unittest/mf_pagecache_single_64k-t-big storage/myisam/.deps/ft_boolean_search.Po storage/myisam/.deps/ft_nlq_search.Po storage/myisam/.deps/ft_parser.Po |