diff options
| author | unknown <joreland@mysql.com> | 2005-02-24 20:48:33 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-24 20:48:33 +0100 |
| commit | 1c2ea24efa893d197e1dee68f08d8ce4c7f992b3 (patch) | |
| tree | 967b16781860568af906ba4561d3ed7d6cd1d986 /sql/sql_parse.cc | |
| parent | 81a39356073af19066a43f6974ea2ff16ea80311 (diff) | |
| parent | 185a811e8e149bc6bc27a1c3a85f1aed20f49806 (diff) | |
| download | mariadb-git-1c2ea24efa893d197e1dee68f08d8ce4c7f992b3.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/include/kernel/signaldata/CreateIndx.hpp:
Auto merged
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