diff options
author | unknown <mskold@mysql.com> | 2006-02-08 10:08:18 +0100 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2006-02-08 10:08:18 +0100 |
commit | 6ba820f25d7fac050c045b4fa9162bcdc89bcf9a (patch) | |
tree | 6355d1063977f26fbcb811672eeeaae67a58afd3 /mysys/list.c | |
parent | 2f3705752a08c561d68e9676d6e9506468fa4bb3 (diff) | |
parent | 5a7517422677175af55f678060d572f77d2f20b7 (diff) | |
download | mariadb-git-6ba820f25d7fac050c045b4fa9162bcdc89bcf9a.tar.gz |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
Diffstat (limited to 'mysys/list.c')
0 files changed, 0 insertions, 0 deletions