diff options
| author | unknown <df@pippilotta.erinye.com> | 2008-01-23 17:00:54 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2008-01-23 17:00:54 +0100 |
| commit | 5e0d806d276d27fef1a5dfcdca92f010836510ed (patch) | |
| tree | 1b43a25ce4e5da288ad92baa561a95c81a0c84ba /ndb/include/ndbapi/NdbDictionary.hpp | |
| parent | b536aa6756c572cbf249e04045925f0932088270 (diff) | |
| parent | f1c8a588436d627911dc22363ad2523108795946 (diff) | |
| download | mariadb-git-5e0d806d276d27fef1a5dfcdca92f010836510ed.tar.gz | |
Merge dev:/data0/mysqldev/my/build-200801111228-5.0.51a/mysql-5.0-release
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-community
mysql-test/r/mysqlcheck.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/sql_view.cc:
Auto merged
configure.in:
merge fix
Diffstat (limited to 'ndb/include/ndbapi/NdbDictionary.hpp')
0 files changed, 0 insertions, 0 deletions