diff options
| author | unknown <brian@zim.(none)> | 2006-08-10 13:44:04 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-10 13:44:04 -0700 |
| commit | 189b8bc5313dc7cddcc225a40c1b2aacd0c2b61e (patch) | |
| tree | 7eef0e76390b5483cb9482dcfd19d0fac649d9cb /mysql-test/r/bdb-crash.result | |
| parent | 6fb4287a4e5c9c76f6dce5f2513163abf3fa1452 (diff) | |
| parent | 04d2b020a49dfc129d587380aba50e5bac6f393b (diff) | |
| download | mariadb-git-189b8bc5313dc7cddcc225a40c1b2aacd0c2b61e.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/bdb-crash.result')
0 files changed, 0 insertions, 0 deletions