diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-02-13 01:22:43 +0400 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-02-13 01:22:43 +0400 |
commit | d30e1c76ae94134bebae247d409c3695612f60cd (patch) | |
tree | a59eeda9c7029dbe5cbace146d40ed7408151567 /mysql-test/t/ndb_autodiscover2.test | |
parent | c01bbd33d79ac5f7ba822a3c8cadb0c31364e366 (diff) | |
parent | 07f36668aecfd3d811c4ed5eb23b1bfdb8c86fdd (diff) | |
download | mariadb-git-d30e1c76ae94134bebae247d409c3695612f60cd.tar.gz |
Merge mysql.com:/home/hf/work/20691/my50-20691
into mysql.com:/home/hf/work/20691/my51-20691
mysql-test/r/default.result:
Auto merged
sql/item.cc:
Auto merged
mysql-test/r/gis.result:
SCCS merged
mysql-test/t/gis.test:
merging
Diffstat (limited to 'mysql-test/t/ndb_autodiscover2.test')
0 files changed, 0 insertions, 0 deletions