diff options
author | unknown <mskold@mysql.com> | 2005-02-17 15:39:23 +0100 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2005-02-17 15:39:23 +0100 |
commit | 134c099c5f604148ab581388e916a698ed0c7964 (patch) | |
tree | a4bc7bf7a82c43fd2a8c694bd3f5a83e230bfdf0 /ndb/src/ndbapi | |
parent | 69bddf6ed12cda16b8f47dd88b80d0a6c56cd62a (diff) | |
parent | e0875776de3675a799731bfdd1c73cd0cf052d03 (diff) | |
download | mariadb-git-134c099c5f604148ab581388e916a698ed0c7964.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'ndb/src/ndbapi')
0 files changed, 0 insertions, 0 deletions