Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  big_geek.:C:/Work/mysql/mysql-5.1-test

libmysqld/cmakelists.txt

@@ -20,6 +20,10 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/zlib 
 )
 
+SET_SOURCE_FILES_PROPERTIES(${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
+                            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
+                            PROPERTIES GENERATED 1)
+                            
 ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
             ../client/get_password.c ../libmysql/errmsg.c
             ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c
@@ -54,11 +58,13 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
             ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc
             ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc
             ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc
-            ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_yacc.cc
+            ../sql/sql_update.cc ../sql/sql_view.cc 
             ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc
             ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
             ../sql/partition_info.cc ../vio/vio.c
-            ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c)
+            ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c
+            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
+            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
 
 # Seems we cannot make a library without at least one source file. So use a
 # dummy empty file