Commit 4a4b6577 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/bar/mysql-5.1-new.b18171
parents 1dc87feb 03e84028

win/cmakefiles/sql

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc discover. 
					  sql_lex.cc sql_list.cc sql_load.cc sql_manager.cc sql_map.cc sql_parse.cc sql_partition.cc

					  sql_plugin.cc sql_prepare.cc sql_rename.cc sql_repl.cc sql_select.cc sql_show.cc

					  sql_state.c sql_string.cc sql_table.cc sql_test.cc sql_trigger.cc sql_udf.cc sql_union.cc

					  sql_update.cc sql_view.cc sql_yacc.h sql_yacc.cc strfunc.cc table.cc thr_malloc.cc time.cc tztime.cc

					  sql_update.cc sql_view.cc strfunc.cc table.cc thr_malloc.cc time.cc tztime.cc

					  uniques.cc unireg.cc item_xmlfunc.cc rpl_tblmap.cc sql_binlog.cc event_executor.cc

					  event_timed.cc sql_tablespace.cc event.cc ../sql-common/my_user.c partition_info.cc

					  ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
@@ -56,7 +56,7 @@ ADD_DEPENDENCIES(mysqld GenError) 
ADD_CUSTOM_COMMAND(

	SOURCE ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy 

	OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

	COMMAND bison.exe ARGS --defines=sql_yacc.h	--output=sql_yacc.cc sql_yacc.yy

	COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h	--output=sql_yacc.cc sql_yacc.yy

	DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)



ADD_CUSTOM_COMMAND(