diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 19:01:36 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 19:01:36 +0100 |
| commit | 185a811e8e149bc6bc27a1c3a85f1aed20f49806 (patch) | |
| tree | 95a992b9e60942bbacc3b5a1a250b3ba7c6ca5e4 /sql/sql_parse.cc | |
| parent | ee27d6a69b004a8ff20feb36f24336e92812ea0a (diff) | |
| parent | 6b38100d6146cae344aaf90d77c0f4475ea30bb8 (diff) | |
| download | mariadb-git-185a811e8e149bc6bc27a1c3a85f1aed20f49806.tar.gz | |
Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
0 files changed, 0 insertions, 0 deletions