diff options
| author | unknown <konstantin@mysql.com> | 2006-01-11 17:49:56 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-11 17:49:56 +0300 |
| commit | c6993d67be04f438514ef05823214795d8a59c9a (patch) | |
| tree | d2448a297f3ed21f2430ed18ab84a946003ad947 /mysql-test/r/bdb-crash.result | |
| parent | aa6d8dcc74040b0dec2b923c5b4ccf8d8262d654 (diff) | |
| parent | 31ff9e9a1077d24287a36a3ff1e9e946e11a6a38 (diff) | |
| download | mariadb-git-c6993d67be04f438514ef05823214795d8a59c9a.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-root
into mysql.com:/opt/local/work/mysql-5.0-root
sql/item_strfunc.cc:
Auto merged
sql/password.c:
Manual merge
Diffstat (limited to 'mysql-test/r/bdb-crash.result')
0 files changed, 0 insertions, 0 deletions