From cd036a63675ecc35d797ea9517c4502fa38dd9a0 Mon Sep 17 00:00:00 2001
From: Jan Martiska <jmartisk@redhat.com>
Date: Wed, 14 Oct 2015 13:25:52 +0200
Subject: [PATCH] [HHH-10188] "stored" is a reserved keyword

(cherry picked from commit 1fa78f9658509bd8a59ac53b67d332cb4c176e23)
---
 .../test/java/org/hibernate/test/legacy/Qux.hbm.xml  |  2 +-
 .../src/test/java/org/hibernate/test/legacy/Qux.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml
index a37b7c9c4c..7a879c626e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.hbm.xml
@@ -19,7 +19,7 @@
 		</many-to-one>
 		<property name="deleted"/>
 		<property name="loaded"/>
-		<property name="stored"/>
+		<property name="store"/>
 		<property name="created"/>
 		<property name="childKey" type="long"/>
 		<property name="stuff"/>
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java
index 3d15ba67cd..a00ff9f494 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/Qux.java
@@ -22,7 +22,7 @@ public class Qux implements Lifecycle {
 	boolean created;
 	boolean deleted;
 	boolean loaded;
-	boolean stored;
+	boolean store;  // this should more logically be named "stored" but that's a reserved keyword on MySQL 5.7
 	private Long key;
 	private String stuff;
 	private Set fums;
@@ -102,11 +102,11 @@ public class Qux implements Lifecycle {
 		this.loaded = loaded;
 	}
 
-	public boolean getStored() {
-		return stored;
+	public boolean getStore() {
+		return store;
 	}
-	private void setStored(boolean stored) {
-		this.stored = stored;
+	private void setStore(boolean store) {
+		this.store = store;
 	}
 
 	public Long getKey() {
@@ -144,7 +144,7 @@ public class Qux implements Lifecycle {
 	}
 
 	public Qux getChild() throws HibernateException, SQLException {
-		stored=true;
+		store =true;
 		this.childKey = child==null ? null : child.getKey();
 		if (childKey!=null && child==null) child = (Qux) session.load(Qux.class, childKey);
 		return child;