List:Commits« Previous MessageNext Message »
From:reggie Date:April 10 2006 9:06pm
Subject:bk commit into 5.1 tree (reggie:1.2311)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of . When  does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2311 06/04/10 16:06:17 reggie@big_geek. +1 -0
  fix cmake generation error

  libmysqld/cmakelists.txt
    1.2 06/04/10 16:06:09 reggie@big_geek. +8 -2
    added generated flag to sql_yacc.cc and sql_yacc.h

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	reggie
# Host:	big_geek.
# Root:	C:/Work/mysql/mysql-5.1-test

--- 1.1/libmysqld/cmakelists.txt	2006-04-03 03:25:23 -05:00
+++ 1.2/libmysqld/cmakelists.txt	2006-04-10 16:06:09 -05:00
@@ -20,6 +20,10 @@
                     ${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 @@
             ../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

Thread
bk commit into 5.1 tree (reggie:1.2311)reggie10 Apr