mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/VC++Files/innobase/innobase.dsp
unknown a8aacf8764 merge with 4.0 
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-com0shm.c~6a16f0c3d81de1f:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
extra/replace.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/configure.in:
  Auto merged
innobase/data/data0data.c:
  Auto merged
innobase/dict/dict0boot.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/dict/dict0mem.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/ha/hash0hash.c:
  Auto merged
innobase/include/btr0btr.ic:
  Auto merged
innobase/include/data0type.ic:
  Auto merged
innobase/include/dict0mem.h:
  Auto merged
innobase/include/log0log.ic:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/include/row0upd.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/include/trx0rseg.ic:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/mtr/mtr0log.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/page/page0cur.c:
  Auto merged
innobase/page/page0page.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/read/read0read.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/rem/rem0rec.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0undo.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/thr/thr0loc.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0rec.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/r/rpl_error_ignored_table.result:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/mf_pack.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
tests/thread_test.c:
  Auto merged
client/mysqldump.c:
  Keep original indentation
mysql-test/r/merge.result:
  keep old file
scripts/mysql_fix_privilege_tables.sh:
  Keep old structure in merge with 4.0
sql/table.cc:
  merge with 4.0 + simple optimizations
2004-03-16 22:41:30 +02:00

466 lines
10 KiB
Text
Raw Blame History

# Microsoft Developer Studio Project File - Name="innobase" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=INNOBASE - WIN32 RELEASE
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "innobase.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "innobase.mak" CFG="INNOBASE - WIN32 RELEASE"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "innobase - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "innobase - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "innobase - Win32 nt" (based on "Win32 (x86) Static Library")
!MESSAGE "innobase - Win32 Max nt" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=xicl6.exe
RSC=rc.exe
!IF "$(CFG)" == "innobase - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "innobase___Win32_Debug"
# PROP BASE Intermediate_Dir "innobase___Win32_Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "debug"
# PROP Intermediate_Dir "debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "__NT__" /D "WIN32" /D "_MBCS" /YX /FD /c
# ADD CPP /nologo /G6 /MTd /W3 /GX /Z7 /Od /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib_release\innobase-nt.lib"
# ADD LIB32 /nologo /out:"..\lib_debug\innodb.lib"
!ELSEIF "$(CFG)" == "innobase - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "innobase___Win32_Release0"
# PROP BASE Intermediate_Dir "innobase___Win32_Release0"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "release"
# PROP Intermediate_Dir "release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
# SUBTRACT CPP /WX /Fr /YX
# ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
!ELSEIF "$(CFG)" == "innobase - Win32 nt"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "innobase___Win32_nt"
# PROP BASE Intermediate_Dir "innobase___Win32_nt"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "nt"
# PROP Intermediate_Dir "nt"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
!ELSEIF "$(CFG)" == "innobase - Win32 Max nt"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "innobase___Win32_Max_nt"
# PROP BASE Intermediate_Dir "innobase___Win32_Max_nt"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "max_nt"
# PROP Intermediate_Dir "max_nt"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /YX /FD /c
# ADD CPP /nologo /G6 /MT /W3 /GX /O2 /I "../innobase/include" /I "../include" /D "NDEBUG" /D "_LIB" /D "_WIN32" /D "WIN32" /D "_MBCS" /D "MYSQL_SERVER" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x416 /d "NDEBUG"
# ADD RSC /l 0x416 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=xilink6.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib_release\innodb.lib"
# ADD LIB32 /nologo /out:"..\lib_release\innodb.lib"
!ENDIF
# Begin Target
# Name "innobase - Win32 Debug"
# Name "innobase - Win32 Release"
# Name "innobase - Win32 nt"
# Name "innobase - Win32 Max nt"
# Begin Source File
SOURCE=.\btr\btr0btr.c
# End Source File
# Begin Source File
SOURCE=.\btr\btr0cur.c
# End Source File
# Begin Source File
SOURCE=.\btr\btr0pcur.c
# End Source File
# Begin Source File
SOURCE=.\btr\btr0sea.c
# End Source File
# Begin Source File
SOURCE=.\buf\buf0buf.c
# End Source File
# Begin Source File
SOURCE=.\buf\buf0flu.c
# End Source File
# Begin Source File
SOURCE=.\buf\buf0lru.c
# End Source File
# Begin Source File
SOURCE=.\buf\buf0rea.c
# End Source File
# Begin Source File
SOURCE=.\com\com0com.c
# End Source File
# Begin Source File
SOURCE=.\com\com0shm.c
# End Source File
# Begin Source File
SOURCE=.\data\data0data.c
# End Source File
# Begin Source File
SOURCE=.\data\data0type.c
# End Source File
# Begin Source File
SOURCE=.\dict\dict0boot.c
# End Source File
# Begin Source File
SOURCE=.\dict\dict0crea.c
# End Source File
# Begin Source File
SOURCE=.\dict\dict0dict.c
# End Source File
# Begin Source File
SOURCE=.\dict\dict0load.c
# End Source File
# Begin Source File
SOURCE=.\dict\dict0mem.c
# End Source File
# Begin Source File
SOURCE=.\dyn\dyn0dyn.c
# End Source File
# Begin Source File
SOURCE=.\eval\eval0eval.c
# End Source File
# Begin Source File
SOURCE=.\eval\eval0proc.c
# End Source File
# Begin Source File
SOURCE=.\fil\fil0fil.c
# End Source File
# Begin Source File
SOURCE=.\fsp\fsp0fsp.c
# End Source File
# Begin Source File
SOURCE=.\fut\fut0fut.c
# End Source File
# Begin Source File
SOURCE=.\fut\fut0lst.c
# End Source File
# Begin Source File
SOURCE=.\ha\ha0ha.c
# End Source File
# Begin Source File
SOURCE=.\ha\hash0hash.c
# End Source File
# Begin Source File
SOURCE=.\ibuf\ibuf0ibuf.c
# End Source File
# Begin Source File
SOURCE=.\pars\lexyy.c
# End Source File
# Begin Source File
SOURCE=.\lock\lock0lock.c
# End Source File
# Begin Source File
SOURCE=.\log\log0log.c
# End Source File
# Begin Source File
SOURCE=.\log\log0recv.c
# End Source File
# Begin Source File
SOURCE=.\mach\mach0data.c
# End Source File
# Begin Source File
SOURCE=.\mem\mem0mem.c
# End Source File
# Begin Source File
SOURCE=.\mem\mem0pool.c
# End Source File
# Begin Source File
SOURCE=.\mtr\mtr0log.c
# End Source File
# Begin Source File
SOURCE=.\mtr\mtr0mtr.c
# End Source File
# Begin Source File
SOURCE=.\os\os0file.c
# End Source File
# Begin Source File
SOURCE=.\os\os0proc.c
# End Source File
# Begin Source File
SOURCE=.\os\os0shm.c
# End Source File
# Begin Source File
SOURCE=.\os\os0sync.c
# End Source File
# Begin Source File
SOURCE=.\os\os0thread.c
# End Source File
# Begin Source File
SOURCE=.\page\page0cur.c
# End Source File
# Begin Source File
SOURCE=.\page\page0page.c
# End Source File
# Begin Source File
SOURCE=.\pars\pars0grm.c
# End Source File
# Begin Source File
SOURCE=.\pars\pars0opt.c
# End Source File
# Begin Source File
SOURCE=.\pars\pars0pars.c
# End Source File
# Begin Source File
SOURCE=.\pars\pars0sym.c
# End Source File
# Begin Source File
SOURCE=.\que\que0que.c
# End Source File
# Begin Source File
SOURCE=.\read\read0read.c
# End Source File
# Begin Source File
SOURCE=.\rem\rem0cmp.c
# End Source File
# Begin Source File
SOURCE=.\rem\rem0rec.c
# End Source File
# Begin Source File
SOURCE=.\row\row0ins.c
# End Source File
# Begin Source File
SOURCE=.\row\row0mysql.c
# End Source File
# Begin Source File
SOURCE=.\row\row0purge.c
# End Source File
# Begin Source File
SOURCE=.\row\row0row.c
# End Source File
# Begin Source File
SOURCE=.\row\row0sel.c
# End Source File
# Begin Source File
SOURCE=.\row\row0uins.c
# End Source File
# Begin Source File
SOURCE=.\row\row0umod.c
# End Source File
# Begin Source File
SOURCE=.\row\row0undo.c
# End Source File
# Begin Source File
SOURCE=.\row\row0upd.c
# End Source File
# Begin Source File
SOURCE=.\row\row0vers.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0que.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0srv.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0start.c
# End Source File
# Begin Source File
SOURCE=.\sync\sync0arr.c
# End Source File
# Begin Source File
SOURCE=.\sync\sync0ipm.c
# End Source File
# Begin Source File
SOURCE=.\sync\sync0rw.c
# End Source File
# Begin Source File
SOURCE=.\sync\sync0sync.c
# End Source File
# Begin Source File
SOURCE=.\thr\thr0loc.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0purge.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0rec.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0roll.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0rseg.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0sys.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0trx.c
# End Source File
# Begin Source File
SOURCE=.\trx\trx0undo.c
# End Source File
# Begin Source File
SOURCE=.\usr\usr0sess.c
# End Source File
# Begin Source File
SOURCE=.\ut\ut0byte.c
# End Source File
# Begin Source File
SOURCE=.\ut\ut0dbg.c
# End Source File
# Begin Source File
SOURCE=.\ut\ut0mem.c
# End Source File
# Begin Source File
SOURCE=.\ut\ut0rnd.c
# End Source File
# Begin Source File
SOURCE=.\ut\ut0ut.c
# End Source File
# End Target
# End Project
Reference in a new issue View git blame Copy permalink