Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.

1 files changed, 18 insertions, 0 deletions

diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index e6c4e69d1a6..0eb8e5de6d2 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -919,6 +919,24 @@ enum enum_alter_table_change_level
   ALTER_TABLE_INDEX_CHANGED= 2
 };
 
+
+/**
+  Temporary hack to enable a class bound forward declaration
+  of the enum_alter_table_change_level enumeration. To be
+  removed once Alter_info is moved to the sql_alter.h
+  header.
+*/
+class Alter_table_change_level
+{
+private:
+  typedef enum enum_alter_table_change_level enum_type;
+  enum_type value;
+public:
+  void operator = (enum_type v) { value = v; }
+  operator enum_type () { return value; }
+};
+
+
 /**
   @brief Parsing data for CREATE or ALTER TABLE.