diff options
| author | unknown <joreland@mysql.com> | 2005-01-11 13:56:06 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-11 13:56:06 +0100 |
| commit | 5756fa92e92d1a25fa0b9b62169ffe4b2a034475 (patch) | |
| tree | 14a811243ec4d0d269c2b73d80341d2fb56a7e3d /mysql-test/ndb | |
| parent | fa09efcb81ccd08861a7e14d851f566dba631140 (diff) | |
| parent | 32ccd8c561568736f576abe2258d29bd58cc7a63 (diff) | |
| download | mariadb-git-5756fa92e92d1a25fa0b9b62169ffe4b2a034475.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
sql/net_serv.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'mysql-test/ndb')
0 files changed, 0 insertions, 0 deletions