From cbacb9c8d9e85a1ccdb0fb2e416862211b568eac Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Thu, 14 Feb 2013 12:28:02 -0500
Subject: [PATCH] HHH-8006 MergeCollectionEventTest & BadMergeHandlingTest fail
 on MySQL

---
 .../test/event/collection/detached/Character.java         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Character.java b/hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Character.java
index 8fb59524a7..d93ae072f2 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Character.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/event/collection/detached/Character.java
@@ -23,17 +23,21 @@
  */
 package org.hibernate.test.event.collection.detached;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
-import java.util.ArrayList;
-import java.util.List;
+import javax.persistence.Table;
 
 /**
  * @author Steve Ebersole
  */
 @Entity
+// "Character" is reserved in MySQL
+@Table( name = "CharacterTable" )
 public class Character implements Identifiable {
 	private Integer id;
 	private String name;