diff options
| author | unknown <igor@rurik.mysql.com> | 2005-03-09 16:53:20 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-03-09 16:53:20 -0800 |
| commit | 83fa3560bc13734b2d92c84064d836fd2e05bc8d (patch) | |
| tree | 323b4ef95a894e973d0d6fe11eba38be1a6e725e /Docs | |
| parent | ab32d7b000d08f50dc482a0b40eba48dd45f46e9 (diff) | |
| parent | e1d3524d814022c3df689917ead8d8eda17db834 (diff) | |
| download | mariadb-git-83fa3560bc13734b2d92c84064d836fd2e05bc8d.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
netware/BUILD/mwenv:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'Docs')
| -rwxr-xr-x | Docs/changelog-4.0.xml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml new file mode 100755 index 00000000000..f0f9aa881f1 --- /dev/null +++ b/Docs/changelog-4.0.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" +"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> +<!-- +This is a dummy changelog file. Don't use it yet. +It merges upward without conflict. +--> +<appendix id="news-4-0-x"> + + <title> + Changes in release 4.0.x + </title> + + <para> + This is a dummy changelog file. Don't use it yet. + </para> + +</appendix> |