mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 09:15:30 +02:00
Manual merge
sql/item_strfunc.cc: Auto merged
This commit is contained in:
commit
85be2e57ab
4 changed files with 113 additions and 0 deletions
18
Docs/changelog-4.0.xml
Executable file
18
Docs/changelog-4.0.xml
Executable file
|
|
@ -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>
|
||||
Loading…
Add table
Add a link
Reference in a new issue