=== modified file 'libmysqld/CMakeLists.txt'
--- libmysqld/CMakeLists.txt	2012-04-05 21:07:18 +0000
+++ libmysqld/CMakeLists.txt	2012-12-18 18:21:39 +0000
@@ -32,7 +32,7 @@
                     ${CMAKE_BINARY_DIR}/sql)
 
 SET(GEN_SOURCES     ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
-                    ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
+                    ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
                     ${CMAKE_SOURCE_DIR}/sql/message.h
                     ${CMAKE_SOURCE_DIR}/sql/message.rc
                     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc

=== modified file 'libmysqld/Makefile.am'
--- libmysqld/Makefile.am	2011-12-11 09:34:44 +0000
+++ libmysqld/Makefile.am	2012-12-18 18:28:26 +0000
@@ -86,7 +86,7 @@
 	sql_expression_cache.cc
 
 # automake misses these
-sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
+sql_yacc.cc sql_yacc.hh: $(top_srcdir)/sql/sql_yacc.yy
 
 # The following libraries should be included in libmysqld.a
 INC_LIB=	$(top_builddir)/regex/libregex.la \

=== modified file 'sql/CMakeLists.txt'
--- sql/CMakeLists.txt	2012-04-05 21:07:18 +0000
+++ sql/CMakeLists.txt	2012-12-18 19:04:50 +0000
@@ -26,7 +26,7 @@
                     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/sql/sql_yacc.h 
+SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
                             ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
                             ${CMAKE_BINARY_DIR}/include/mysql_version.h
                             ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
@@ -88,7 +88,7 @@
                create_options.cc
                sql_expression_cache.cc
                ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
-               ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
+               ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
                ${CMAKE_BINARY_DIR}/include/mysqld_error.h
                ${CMAKE_BINARY_DIR}/include/mysqld_ername.h 
                ${CMAKE_BINARY_DIR}/include/sql_state.h
@@ -134,9 +134,9 @@
 
 # Sql Parser custom command
 ADD_CUSTOM_COMMAND(
-        OUTPUT ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
+        OUTPUT ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
                ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
-        COMMAND bison ARGS -y -p MYSQL --defines=sql_yacc.h
+        COMMAND bison ARGS -y -p MYSQL --defines=sql_yacc.hh
                                --output=sql_yacc.cc "${CMAKE_CURRENT_SOURCE_DIR}/sql_yacc.yy"
         DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)
 
@@ -152,7 +152,7 @@
 
 ADD_CUSTOM_TARGET(
         GenServerSource ALL
-        DEPENDS ${CMAKE_BINARY_DIR}/sql/sql_yacc.h
+        DEPENDS ${CMAKE_BINARY_DIR}/sql/sql_yacc.hh
                 ${CMAKE_BINARY_DIR}/sql/sql_yacc.cc
                 ${CMAKE_BINARY_DIR}/sql/lex_hash.h)
 
@@ -160,7 +160,7 @@
 
 # Remove the auto-generated files as part of 'Clean Solution'
 SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES 
-  "lex_hash.h;sql_yacc.h;sql_yacc.cc;mysqld.def")
+  "lex_hash.h;sql_yacc.hh;sql_yacc.cc;mysqld.def")
 
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
 ADD_DEPENDENCIES(udf_example strings GenError)

=== modified file 'sql/Makefile.am'
--- sql/Makefile.am	2012-08-22 14:45:25 +0000
+++ sql/Makefile.am	2012-12-18 19:05:11 +0000
@@ -163,7 +163,7 @@
 			-DHAVE_EVENT_SCHEDULER \
 			@DEFS@
 
-BUILT_MAINT_SRC =	sql_yacc.cc sql_yacc.h
+BUILT_MAINT_SRC =	sql_yacc.cc sql_yacc.hh
 BUILT_SOURCES =		$(BUILT_MAINT_SRC) lex_hash.h link_sources
 EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
 			nt_servc.cc nt_servc.h mysql_install_db.cc mysql_upgrade_service.cc \

=== modified file 'sql/sql_lex.h'
--- sql/sql_lex.h	2012-08-22 14:45:25 +0000
+++ sql/sql_lex.h	2012-12-18 19:06:10 +0000
@@ -47,7 +47,7 @@
 #else
 #include "lex_symbol.h"
 #if MYSQL_LEX
-#include "sql_yacc.h"
+#include "sql_yacc.hh"
 #define LEX_YYSTYPE YYSTYPE *
 #else
 #define LEX_YYSTYPE void *