diff options
| author | unknown <hhunger@hh-nb.hungers> | 2008-04-23 11:59:31 +0200 |
|---|---|---|
| committer | unknown <hhunger@hh-nb.hungers> | 2008-04-23 11:59:31 +0200 |
| commit | 7875d9241ce4e89c9eb3be40533680b1bd7cea66 (patch) | |
| tree | dea90206194b39cb2d43626a7521b6331a15143b /.bzrignore | |
| parent | adf397e7086da18ee17725acd0dc6400453fd33f (diff) | |
| parent | 9fd9785a4a166d1ac33b9c0901bbf47724cc66a6 (diff) | |
| download | mariadb-git-7875d9241ce4e89c9eb3be40533680b1bd7cea66.tar.gz | |
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build
BitKeeper/etc/ignore:
auto-union
mysql-test/t/disabled.def:
Auto merged
BitKeeper/deleted/.del-group_concat_max_len_func.result:
Delete: mysql-test/r/group_concat_max_len_func.result
BitKeeper/deleted/.del-group_concat_max_len_func.test:
Delete: mysql-test/t/group_concat_max_len_func.test
BitKeeper/deleted/.del-max_allowed_packet_func.test:
Delete: mysql-test/t/max_allowed_packet_func.test
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
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 |