summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorReggie@xgeek. <>2006-03-15 02:16:16 -0600
committerReggie@xgeek. <>2006-03-15 02:16:16 -0600
commit605d6f05689f4f45bc0eb5e935c0660706793606 (patch)
tree5cbbb31aadd59194b51c3037d08a2378f49630d0 /win
parentecf41eea09902f958cb475b1eade6f0ecb3ebe26 (diff)
downloadmariadb-git-605d6f05689f4f45bc0eb5e935c0660706793606.tar.gz
sql:
removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
Diffstat (limited to 'win')
-rw-r--r--win/cmakefiles/sql4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/cmakefiles/sql b/win/cmakefiles/sql
index 72a71cbf14f..2099ef94996 100644
--- a/win/cmakefiles/sql
+++ b/win/cmakefiles/sql
@@ -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(