diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-28 20:59:57 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 20:59:57 +0100 |
| commit | c789301fcd3877a21d328b8e3c4ab97148d879f3 (patch) | |
| tree | abd103946cab0eae83e36388b799bb0e86227ee3 /.bzrignore | |
| parent | db875c0c070d34c525f650b15912273d74d4f8aa (diff) | |
| parent | 5be953f896d0c28395605b103a60182b648e78c7 (diff) | |
| download | mariadb-git-c789301fcd3877a21d328b8e3c4ab97148d879f3.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/collapsed:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/rpl_deadlock.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
include/my_sys.h:
Manual merge, my_getpagesize broken out of "#ifdef HAVE_SYS_MMAN_H"
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index a8e964fd0c3..778948eaba6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -698,6 +698,7 @@ mysql-test/r/*.err mysql-test/r/*.log mysql-test/r/*.out mysql-test/r/*.reject +mysql-test/r/*.warnings mysql-test/r/alter_table.err mysql-test/r/archive.err mysql-test/r/bdb-alter-table-1.err |