diff options
| author | unknown <jani@ibmlab.site> | 2006-03-15 10:19:24 +0200 |
|---|---|---|
| committer | unknown <jani@ibmlab.site> | 2006-03-15 10:19:24 +0200 |
| commit | adf82864a9d5d433de6e21d8a86766106c2d37f2 (patch) | |
| tree | fc27dd9f32f58a1d17aa9efc35ce0c9e5f8f0555 | |
| parent | 4b4a13a150c7aeffc3cd96f485b7f16ea9ea034d (diff) | |
| parent | 03e84028d72d6b0bc0e072c0305e47b9b7fbd8b4 (diff) | |
| download | mariadb-git-adf82864a9d5d433de6e21d8a86766106c2d37f2.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into ibmlab.site:/home/my/bk/mysql-5.1-new
| -rw-r--r-- | win/cmakefiles/sql | 4 |
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( |