diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-21 21:28:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-21 21:28:51 +0200 |
| commit | 8823fa22f16acca6e540074fdcd2491183a38707 (patch) | |
| tree | 746b47095ebdcc9cd407758fe0edc8f9e2495e33 /VC++Files/vio | |
| parent | 1291f7798dbf2f711c2b7c85e785cf46d942fc8f (diff) | |
| parent | 5d5b1fee0211ccd8b234f917075af6d82899e9d2 (diff) | |
| download | mariadb-git-8823fa22f16acca6e540074fdcd2491183a38707.tar.gz | |
Merge
client/mysql.cc:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/protocol.cc:
SCCS merged
Diffstat (limited to 'VC++Files/vio')
| -rw-r--r-- | VC++Files/vio/vio.dsp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/VC++Files/vio/vio.dsp b/VC++Files/vio/vio.dsp index d4b77aad391..50c920a465d 100644 --- a/VC++Files/vio/vio.dsp +++ b/VC++Files/vio/vio.dsp @@ -7,19 +7,19 @@ CFG=vio - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "vio.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "vio.mak" CFG="vio - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "vio - Win32 Release" (based on "Win32 (x86) Static Library") !MESSAGE "vio - Win32 Debug" (based on "Win32 (x86) Static Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -74,7 +74,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"..\lib_debug\vio.lib" -!ENDIF +!ENDIF # Begin Target |