diff options
| author | unknown <kroki@mysql.com> | 2006-05-06 11:18:42 +0400 |
|---|---|---|
| committer | unknown <kroki@mysql.com> | 2006-05-06 11:18:42 +0400 |
| commit | 77b7a71dd4a642707b57bbf2ab5c7dd2a0c67479 (patch) | |
| tree | a9773b7324caaaa0cbf35e9ad1757b17f865cfb5 /Docs | |
| parent | 5e5f38ac3f9a1b2466d2848ca9539efd0d0e4ee4 (diff) | |
| parent | 8515e8f0aee0d670ee4f88c2a8792503b24b5a5d (diff) | |
| download | mariadb-git-77b7a71dd4a642707b57bbf2ab5c7dd2a0c67479.tar.gz | |
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-merge
mysql-test/r/func_misc.result:
Manual merge of the fix for bug#16501.
mysql-test/t/func_misc.test:
Manual merge of the fix for bug#16501.
sql/item_func.cc:
Manual merge of the fix for bug#16501.
sql/sql_acl.cc:
For the fix of bug#16372, use local version, since the fix for 5.0 is
different, and will go in separate ChangeSet.
Diffstat (limited to 'Docs')
| -rwxr-xr-x | Docs/changelog-4.0.xml | 18 | ||||
| -rwxr-xr-x | Docs/changelog-4.1.xml | 18 |
2 files changed, 0 insertions, 36 deletions
diff --git a/Docs/changelog-4.0.xml b/Docs/changelog-4.0.xml deleted file mode 100755 index f0f9aa881f1..00000000000 --- a/Docs/changelog-4.0.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?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> diff --git a/Docs/changelog-4.1.xml b/Docs/changelog-4.1.xml deleted file mode 100755 index 644f2940d0f..00000000000 --- a/Docs/changelog-4.1.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?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-1-x"> - - <title> - Changes in release 4.1.x - </title> - - <para> - This is a dummy changelog file. Don't use it yet. - </para> - -</appendix> |