From 26ba52480347c43db5f47e8128d3b9fdb2ab7929 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 21 Jul 2005 21:47:46 +0200 Subject: File / directory structure change from 5.0 to 5.1: Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the tools for Windows: 1) When the source package is created, there is the additional level "storage". 2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync. 3) Within the project files, references to/from the table handlers must cross that level. VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw: mvdir VC++Files/storage/bdb/build_win32/db_archive.dsp: mvdir VC++Files/storage/bdb/build_win32/db_buildall.dsp: mvdir VC++Files/storage/bdb/build_win32/db_checkpoint.dsp: mvdir VC++Files/storage/bdb/build_win32/db_deadlock.dsp: mvdir VC++Files/storage/bdb/build_win32/db_dll.dsp: mvdir VC++Files/storage/bdb/build_win32/db_dump.dsp: mvdir VC++Files/storage/bdb/build_win32/db_java.dsp: mvdir VC++Files/storage/bdb/build_win32/db_load.dsp: mvdir VC++Files/storage/bdb/build_win32/db_printlog.dsp: mvdir VC++Files/storage/bdb/build_win32/db_recover.dsp: mvdir VC++Files/storage/bdb/build_win32/db_stat.dsp: mvdir VC++Files/storage/bdb/build_win32/db_static.dsp: mvdir VC++Files/storage/bdb/build_win32/db_static1.dsp: mvdir VC++Files/storage/bdb/build_win32/db_tcl.dsp: mvdir VC++Files/storage/bdb/build_win32/db_test.dsp: mvdir VC++Files/storage/bdb/build_win32/db_upgrade.dsp: mvdir VC++Files/storage/bdb/build_win32/db_verify.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_access.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_btrec.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_env.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_lock.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_mpool.dsp: mvdir VC++Files/storage/bdb/build_win32/ex_tpcb.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_access.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_btrec.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_env.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_lock.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_mpool.dsp: mvdir VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp: mvdir VC++Files/storage/bdb/build_win32/libdb.def: mvdir VC++Files/storage/bdb/build_win32/libdb_tcl.def: mvdir VC++Files/mysql.dsw: Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the hierarchy of project files. VC++Files/mysql_ia64.dsw: Table handlers "heap", "innobase", "myisam", and "myisammrg" have been moved into a common subdirectory "storage". This must be reflected in the hierarchy of project files. VC++Files/sql/mysqld.dsp: Table handler "bdb" has been moved into a subdirectory "storage". File "myrg_rnext_same.c" belongs to project "myisammrg". VC++Files/storage/bdb/bdb.dsp: Table handler "bdb" has been moved into a subdirectory "storage", so the path to the directories keeping the libraries must point one level higher. VC++Files/storage/heap/heap.dsp: Table handler "heap" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/heap/heap_ia64.dsp: Table handler "heap" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. scripts/make_win_src_distribution.sh: Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb" have been moved into a common subdirectory "storage". This must be reflected when creating a source package for Windows. VC++Files/storage/innobase/innobase.dsp: Table handler "innobase" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/innobase/innobase_ia64.dsp: Table handler "innobase" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisam/myisam.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisam/myisam_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisammrg/myisammrg.dsp: Table handler "myisammrg" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. VC++Files/storage/myisammrg/myisammrg_ia64.dsp: Table handler "myisammrg" has been moved into a subdirectory "storage", so the pathes to the directories keeping the global includes and libraries must point one level higher. --- VC++Files/sql/mysqld.dsp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'VC++Files/sql') diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index e8f24b300cb..e2832c98434 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -75,7 +75,7 @@ LINK32=xilink6.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c +# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c # SUBTRACT CPP /Fr /YX # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -130,7 +130,7 @@ LINK32=xilink6.exe # PROP Target_Dir "" # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c +# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -159,7 +159,7 @@ LINK32=xilink6.exe # PROP Target_Dir "" # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c +# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -1110,10 +1110,6 @@ SOURCE=.\my_time.c # End Source File # Begin Source File -SOURCE=..\myisammrg\myrg_rnext_same.c -# End Source File -# Begin Source File - SOURCE=.\mysqld.cpp !IF "$(CFG)" == "mysqld - Win32 Release" -- cgit v1.2.1 From a30672d2a4aee8cf28c1bef9f5e279eada410228 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Jul 2005 18:45:31 +0200 Subject: File / directory structure change from 5.0 to 5.1: Table handlers "bdb" and "myisam" (and others) have been moved into a common subdirectory "storage". Include paths between main projects and table handler files need to be adapted. VC++Files/libmysqld/libmysqld.dsp: Table handler "bdb" has been moved into a subdirectory "storage", so the path to the include files must reflect this. VC++Files/myisam_ftdump/myisam_ftdump.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisamchk/myisamchk.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisamchk/myisamchk_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisamlog/myisamlog.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisamlog/myisamlog_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisampack/myisampack.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/myisampack/myisampack_ia64.dsp: Table handler "myisam" has been moved into a subdirectory "storage", so the pathes to the include and source files must reflect this. VC++Files/sql/mysqld_ia64.dsp: Table handler "bdb" has been moved into a subdirectory "storage", so the path to the include files must reflect this. --- VC++Files/sql/mysqld_ia64.dsp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'VC++Files/sql') diff --git a/VC++Files/sql/mysqld_ia64.dsp b/VC++Files/sql/mysqld_ia64.dsp index 310f48fcfb9..11809875aaa 100644 --- a/VC++Files/sql/mysqld_ia64.dsp +++ b/VC++Files/sql/mysqld_ia64.dsp @@ -77,7 +77,7 @@ LINK32=link.exe # PROP Target_Dir "" MTL=midl.exe # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c +# ADD CPP /nologo /MTd /W3 /Zi /Od /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /G2 /EHsc /Wp64 /Zm600 /c # SUBTRACT CPP /Fr /YX # ADD BASE RSC /l 0x410 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" @@ -134,7 +134,7 @@ LINK32=link.exe MTL=midl.exe # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt-max /G2 /EHsc /Wp64 /Zm600 /c +# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-nt-max /G2 /EHsc /Wp64 /Zm600 /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" @@ -164,7 +164,7 @@ LINK32=link.exe MTL=midl.exe # ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-max /G2 /EHsc /Wp64 /Zm600 /c +# ADD CPP /nologo /MT /W3 /Zi /O2 /I "../storage/bdb/build_win32" /I "../include" /I "../regex" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D "_IA64_" /D "WIN64" /D "WIN32" /D "_AFX_NO_DAO_SUPPORT" /FD /DMYSQL_SERVER_SUFFIX=-max /G2 /EHsc /Wp64 /Zm600 /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" -- cgit v1.2.1