diff options
author | unknown <gluh@mysql.com> | 2005-06-07 11:31:07 +0500 |
---|---|---|
committer | unknown <gluh@mysql.com> | 2005-06-07 11:31:07 +0500 |
commit | 7a6c62a107b961d2713cbd3ec56e11652920f45b (patch) | |
tree | 432bafa9f4891c76c3db0655cdf6dbb1a9cadf29 /ndb | |
parent | 6f1db965ad6c798ab38e7b28fcd55667659129b3 (diff) | |
parent | a88d3cc149e4686bcca7b655d3ddaa437c42168e (diff) | |
download | mariadb-git-7a6c62a107b961d2713cbd3ec56e11652920f45b.tar.gz |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.10964
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/sql_acl.cc:
Auto merged
Diffstat (limited to 'ndb')
0 files changed, 0 insertions, 0 deletions