summaryrefslogtreecommitdiff
path: root/storage/xtradb/pars/pars0grm.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:47:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-05-13 17:54:04 +0300
commit26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch)
tree7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /storage/xtradb/pars/pars0grm.cc
parent8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff)
parentcb248f880619431850e5638009a6098048050edf (diff)
downloadmariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz
Merge 10.1 into 10.2
Diffstat (limited to 'storage/xtradb/pars/pars0grm.cc')
-rw-r--r--storage/xtradb/pars/pars0grm.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/pars/pars0grm.cc b/storage/xtradb/pars/pars0grm.cc
index b360f36e597..c3649d92555 100644
--- a/storage/xtradb/pars/pars0grm.cc
+++ b/storage/xtradb/pars/pars0grm.cc
@@ -18,7 +18,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 02110-1301, USA. */
+ Boston, MA 02110-1335 USA. */
/* As a special exception, you may create a larger work that contains
part or all of the Bison parser skeleton and distribute that work