diff options
author | unknown <bar@mysql.com> | 2006-03-02 10:42:08 +0400 |
---|---|---|
committer | unknown <bar@mysql.com> | 2006-03-02 10:42:08 +0400 |
commit | 526d28f36a8e5cabbec495d5745230faa0471011 (patch) | |
tree | 870c8c101fe7f45878a5679e849ae600cb287094 /Docs/changelog-4.0.xml | |
parent | 605c82d2a8502d4114a0ab1768ccf894903699e6 (diff) | |
parent | 3f480fcb9f726f65925526045e036b16ecc2d8fa (diff) | |
download | mariadb-git-526d28f36a8e5cabbec495d5745230faa0471011.tar.gz |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/home/bar/mysql-5.1-new.16315
sql/item_xmlfunc.cc:
Auto merged
mysql-test/r/xml.result:
After merge fix
mysql-test/t/xml.test:
After merge fix
Diffstat (limited to 'Docs/changelog-4.0.xml')
0 files changed, 0 insertions, 0 deletions