summaryrefslogtreecommitdiff
path: root/sql/my_json_writer.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-14 17:18:46 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-14 17:18:46 +0300
commitbe85d3e61bb4217453a6879cb28d9bd369ad17dd (patch)
treec1ec0aab43cf0df71d88b8278367a79aabc43f52 /sql/my_json_writer.cc
parentc0bc9480e73242b075178cb5da5713ba9d84be7c (diff)
parent26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (diff)
downloadmariadb-git-be85d3e61bb4217453a6879cb28d9bd369ad17dd.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/my_json_writer.cc')
-rw-r--r--sql/my_json_writer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/my_json_writer.cc b/sql/my_json_writer.cc
index d219e88b98b..c96fc9fc0e1 100644
--- a/sql/my_json_writer.cc
+++ b/sql/my_json_writer.cc
@@ -11,7 +11,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
#include "mariadb.h"
#include "sql_priv.h"