diff options
| author | unknown <joreland@mysql.com> | 2005-07-25 13:23:34 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-07-25 13:23:34 +0200 |
| commit | 29911d7c8bf4919406e6bd5535f8ab8a6aaa5bda (patch) | |
| tree | 5d6883bf76eb711ce887c4bd087a6a40918dafe3 /extra | |
| parent | 414eb710e4e81cb41befc137565d273c96f10262 (diff) | |
| parent | ea010ef58494b9e578ce85b890f4a95769227729 (diff) | |
| download | mariadb-git-29911d7c8bf4919406e6bd5535f8ab8a6aaa5bda.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
Diffstat (limited to 'extra')
0 files changed, 0 insertions, 0 deletions