diff options
| author | unknown <svoj@april.(none)> | 2007-01-25 01:51:13 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2007-01-25 01:51:13 +0400 |
| commit | 247bd923c2d7baee7a2bef5de3bbf9ee3b940abc (patch) | |
| tree | b1cc56ee11a118751bf1f6774d9f8f0737db5f1d /sql/item_xmlfunc.h | |
| parent | 1cf811786303b6626a16807425c264835ff22857 (diff) | |
| parent | 2ed7eaf56424485e475ef7f1c430b1881ac02fc2 (diff) | |
| download | mariadb-git-247bd923c2d7baee7a2bef5de3bbf9ee3b940abc.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/myisam.result:
Use local.
mysql-test/t/myisam.test:
Use local.
Diffstat (limited to 'sql/item_xmlfunc.h')
0 files changed, 0 insertions, 0 deletions