diff options
author | unknown <sasha@asksasha.com> | 2005-09-14 06:37:52 -0600 |
---|---|---|
committer | unknown <sasha@asksasha.com> | 2005-09-14 06:37:52 -0600 |
commit | 3be8c9074a8f65bfe82ed218b64f989da295f674 (patch) | |
tree | 9429b2253660211c1617ac89d98074c61fe2e785 /mysql-test/r/ndb_autodiscover.result | |
parent | 02fce1c316e7a33748eb7ccf13a49fbaa2926ee6 (diff) | |
parent | f89424f8b69d50fb26c0af3d226ac20afe2a32da (diff) | |
download | mariadb-git-3be8c9074a8f65bfe82ed218b64f989da295f674.tar.gz |
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_autodiscover.result')
0 files changed, 0 insertions, 0 deletions