diff options
author | unknown <paul@kite-hub.kitebird.com> | 2006-03-14 13:28:24 -0600 |
---|---|---|
committer | unknown <paul@kite-hub.kitebird.com> | 2006-03-14 13:28:24 -0600 |
commit | 4ac5afa3b991654a38b39ad44880e74da06a02c3 (patch) | |
tree | 29f8a25fc5f7a013e5c68a26a4e73278c9ee14b8 /sql/item_xmlfunc.cc | |
parent | 07487439b00aab16412d29b82fb931d542c7fa3b (diff) | |
parent | 232dec09d9399efcc63c06e2a3aaba0713c31368 (diff) | |
download | mariadb-git-4ac5afa3b991654a38b39ad44880e74da06a02c3.tar.gz |
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0-r1.2084
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.1
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/item_xmlfunc.cc')
0 files changed, 0 insertions, 0 deletions