summaryrefslogtreecommitdiff
path: root/win
Commit message (Collapse)AuthorAgeFilesLines
* Deleted old storage directories (introduced by a buggy 5.0 -> 5.1 merge).unknown2006-09-211-1/+1
| | | | | | | | | | | | | | | | | | Fix for win/Makefile.am BitKeeper/deleted/.del-CMakeLists.txt~dd682cce1d53c0b4: Delete: bdb/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740: Delete: myisam/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~4ef559bc8b4695f7: Delete: heap/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d: Delete: innobase/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~84669765249a4bad: Delete: myisammrg/CMakeLists.txt win/Makefile.am: added missing support for 64-bit build file (make dist)
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-0/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint BitKeeper/deleted/.del-CMakeLists.txt~1: Delete: CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~2: Delete: server-tools/instance-manager/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~3: Delete: sql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~4: Delete: strings/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5: Delete: tests/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~6: Delete: vio/CMakeLists.txt BitKeeper/deleted/.del-Makefile.am~2: Delete: win/Makefile.am BitKeeper/deleted/.del-README~1: Delete: win/README BitKeeper/deleted/.del-build-vs71.bat: Delete: win/build-vs71.bat BitKeeper/deleted/.del-build-vs8.bat: Delete: win/build-vs8.bat BitKeeper/deleted/.del-configure.js: Delete: win/configure.js BitKeeper/deleted/.del-CMakeLists.txt~7: Delete: client/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~8: Delete: zlib/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~9: Delete: dbug/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~10: Delete: extra/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~11: Delete: extra/yassl/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~12: Delete: extra/yassl/taocrypt/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~13: Delete: libmysql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~14: Delete: mysys/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~15: Delete: regex/CMakeLists.txt
| * Additional files for cmake supportunknown2006-08-316-0/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMakeLists.txt: New BitKeeper file ``CMakeLists.txt'' bdb/CMakeLists.txt: New BitKeeper file ``bdb/CMakeLists.txt'' client/CMakeLists.txt: New BitKeeper file ``client/CMakeLists.txt'' dbug/CMakeLists.txt: New BitKeeper file ``dbug/CMakeLists.txt'' extra/CMakeLists.txt: New BitKeeper file ``extra/CMakeLists.txt'' extra/yassl/CMakeLists.txt: New BitKeeper file ``extra/yassl/CMakeLists.txt'' extra/yassl/taocrypt/CMakeLists.txt: New BitKeeper file ``extra/yassl/taocrypt/CMakeLists.txt'' heap/CMakeLists.txt: New BitKeeper file ``heap/CMakeLists.txt'' innobase/CMakeLists.txt: New BitKeeper file ``innobase/CMakeLists.txt'' libmysql/CMakeLists.txt: New BitKeeper file ``libmysql/CMakeLists.txt'' myisam/CMakeLists.txt: New BitKeeper file ``myisam/CMakeLists.txt'' myisammrg/CMakeLists.txt: New BitKeeper file ``myisammrg/CMakeLists.txt'' mysys/CMakeLists.txt: New BitKeeper file ``mysys/CMakeLists.txt'' regex/CMakeLists.txt: New BitKeeper file ``regex/CMakeLists.txt'' server-tools/CMakeLists.txt: New BitKeeper file ``server-tools/CMakeLists.txt'' server-tools/instance-manager/CMakeLists.txt: New BitKeeper file ``server-tools/instance-manager/CMakeLists.txt'' sql/CMakeLists.txt: New BitKeeper file ``sql/CMakeLists.txt'' sql/examples/CMakeLists.txt: New BitKeeper file ``sql/examples/CMakeLists.txt'' strings/CMakeLists.txt: New BitKeeper file ``strings/CMakeLists.txt'' tests/CMakeLists.txt: New BitKeeper file ``tests/CMakeLists.txt'' vio/CMakeLists.txt: New BitKeeper file ``vio/CMakeLists.txt'' win/Makefile.am: New BitKeeper file ``win/Makefile.am'' win/README: New BitKeeper file ``win/README'' win/build-vs71.bat: New BitKeeper file ``win/build-vs71.bat'' win/build-vs8.bat: New BitKeeper file ``win/build-vs8.bat'' win/build-vs8_x64.bat: New BitKeeper file ``win/build-vs8_x64.bat'' win/configure.js: New BitKeeper file ``win/configure.js'' zlib/CMakeLists.txt: New BitKeeper file ``zlib/CMakeLists.txt''
* Removed warnings for Windows build issues. Edited Windows README to remove ↵unknown2006-08-142-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | reference to BDB. libmysqld/CMakeLists.txt: Fix for build for BDB mysys/base64.c: Removed warning mysys/my_pread.c: Removed warning sql-common/my_time.c: Removed Warning sql/CMakeLists.txt: Editing for BDB storage/csv/ha_tina.cc: Removed warning storage/myisam/ft_parser.c: Removed warning storage/myisam/mi_delete_all.c: Removed unused variable storage/myisam/mi_packrec.c: Removed unused variable win/README: Fixed docs on Windows BDB win/configure.js: Removed function call to add support for building BDB
* Fixing false alarm errors on windows build from a clean clone.unknown2006-06-152-2/+2
| | | | | | | | | win/build-vs71.bat: Don't trigger 'could not find the file specified' errors when running from a clean clone. win/build-vs8.bat: Don't trigger 'could not find the file specified' errors when running from a clean clone.
* Update readme file with instructions for VCExpress and Platform SDKunknown2006-04-101-0/+5
|
* Fix files not removed from make dist when deleted.unknown2006-03-281-1/+1
|
* Clean up CMake configuration following review.unknown2006-03-283-447/+86
| | | | | | | | | | | | | | BitKeeper/deleted/.del-config-version.js~b31bb5a8: Delete: win/config-version.js BitKeeper/deleted/.del-config-handlerton.js~553d3402: Delete: win/config-handlerton.js cmakelists.txt: Clean up configuration, better integration with CMake. sql/cmakelists.txt: Only build ha_xxx.cc for configured storage engines. Only link with configured storage engine projects. win/configure.js: Move the task of config-version.js into configure.js.
* Manual merge.unknown2006-03-284-20/+154
|\ | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/mysqld.cc: Auto merged sql/sql_insert.cc: Auto merged
| * Some changes to make it possible to build for Windows with CMake fromunknown2006-03-241-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a normal 'make dist' source .tar.gz. libmysql/mytest.c: bk cp VC++Files/libmysqltest/mytest.c libmysql/mytest.c sql/message.mc: bk cp VC++Files/sql/message.mc sql/message.mc Makefile.am: Add Windows CMake stuff. client/Makefile.am: Add extra files needed for CMake Windows build. cmakelists.txt: Fix subdir order to make CMake dependency calculations happy. configure.in: Add extra files needed for CMake Windows build. extra/Makefile.am: Add extra files needed for CMake Windows build. extra/yassl/Makefile.am: Add extra files needed for CMake Windows build. libmysql/Makefile.am: Add extra files needed for CMake Windows build. libmysql/cmakelists.txt: Move mytest.c to a more sensible location. libmysqld/Makefile.am: Add extra files needed for CMake Windows build. mysys/Makefile.am: Add extra files needed for CMake Windows build. regex/Makefile.am: Add extra files needed for CMake Windows build. server-tools/instance-manager/Makefile.am: Add extra files needed for CMake Windows build. sql/Makefile.am: Add extra files needed for CMake Windows build. sql/cmakelists.txt: Move message.mc to a more sensible location. Add some dependencies to avoid a stale handlerton.cc. storage/archive/Makefile.am: Add extra files needed for CMake Windows build. storage/bdb/Makefile.in: Add extra files needed for CMake Windows build. storage/example/Makefile.am: Add extra files needed for CMake Windows build. storage/heap/Makefile.am: Add extra files needed for CMake Windows build. storage/innobase/Makefile.am: Add extra files needed for CMake Windows build. storage/innobase/include/univ.i: Avoid including Unix config in Windows build. storage/myisam/Makefile.am: Add extra files needed for CMake Windows build. storage/myisammrg/Makefile.am: Add extra files needed for CMake Windows build. strings/Makefile.am: Add extra files needed for CMake Windows build. tests/Makefile.am: Add extra files needed for CMake Windows build. vio/Makefile.am: Add extra files needed for CMake Windows build. zlib/Makefile.am: Add extra files needed for CMake Windows build.
| * Updated CMake stuff to handle the configurations needed for releaseunknown2006-03-233-20/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | builds. cmakelists.txt: Get the correct options for storage engines and defines from config-version.js. mysys/cmakelists.txt: Set USE_TLS only for release builds, as it crashes in debug builds. sql/cmakelists.txt: Fix build options to only include the configured storage engines. sql/mysqld.cc: Fix dummy innodb declarations, otherwise non-innodb build fails. storage/bdb/cmakelists.txt: Create cmakelists.txt for BDB. win/README: Update with new configure.js options. win/config-handlerton.js: Extend with more storage engines. win/config-version.js: Extend to handle storage engines and other configuration parameters.
* | removed handlerton-win.ccunknown2006-03-271-1/+21
|/ | | | | | | | | | | | | | | | | | now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on the storage engines given on the command line BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df: Delete: sql/handlerton-win.cc cmakelists.txt: use INCLUDE to read in the cmake file generated as part of configure comment out the setting of /wd4996 since we are using the -D flag instead sql/cmakelists.txt: include IF() blocks for every storage engine and set two vars that are used with CONFIGURE_FILE later in the script. This CONFIGURE_FILE call replaces the need for config-handlerton.js win/configure.js: write out proper cmake code instead of just the values.
* Fix Windows CMake dependency problem.unknown2006-03-161-7/+2
| | | | | | | | | | | | | | | client/cmakelists.txt: Fix dependency problem with the old GenError target. extra/cmakelists.txt: Fix dependency problem with the old GenError target. libmysql/cmakelists.txt: Fix dependency problem with the old GenError target. server-tools/instance-manager/cmakelists.txt: Fix dependency problem with the old GenError target. sql/cmakelists.txt: Fix dependency problem with the old GenError target. win/README: Fix dependency problem with the old GenError target.
* Removed calls to deploy.bat from the build scripts since the cmake scripts ↵unknown2006-03-152-10/+0
| | | | | | | | | | | are now out in the target directories.
* Moved cmake scripts into the proper directoriesunknown2006-03-1521-537/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/cmakelists.txt: Rename: sql/sql -> sql/cmakelists.txt zlib/cmakelists.txt: Rename: win/cmakefiles/zlib -> zlib/cmakelists.txt vio/cmakelists.txt: Rename: win/cmakefiles/vio -> vio/cmakelists.txt regex/cmakelists.txt: Rename: win/cmakefiles/regex -> regex/cmakelists.txt mysys/cmakelists.txt: Rename: win/cmakefiles/mysys -> mysys/cmakelists.txt cmakelists.txt: Rename: win/cmakefiles/base -> cmakelists.txt dbug/cmakelists.txt: Rename: win/cmakefiles/dbug -> dbug/cmakelists.txt strings/cmakelists.txt: Rename: win/cmakefiles/strings -> strings/cmakelists.txt libmysql/cmakelists.txt: Rename: win/cmakefiles/libmysql -> libmysql/cmakelists.txt client/cmakelists.txt: Rename: win/cmakefiles/client -> client/cmakelists.txt extra/cmakelists.txt: Rename: win/cmakefiles/extra -> extra/cmakelists.txt tests/cmakelists.txt: Rename: win/cmakefiles/tests -> tests/cmakelists.txt server-tools/instance-manager/cmakelists.txt: Rename: win/cmakefiles/im -> server-tools/instance-manager/cmakelists.txt storage/heap/cmakelists.txt: Rename: win/cmakefiles/heap -> storage/heap/cmakelists.txt storage/myisam/cmakelists.txt: Rename: win/cmakefiles/myisam -> storage/myisam/cmakelists.txt storage/myisammrg/cmakelists.txt: Rename: win/cmakefiles/myisammrg -> storage/myisammrg/cmakelists.txt storage/bdb/cmakelists.txt: Rename: win/cmakefiles/bdb -> storage/bdb/cmakelists.txt storage/innobase/cmakelists.txt: Rename: win/cmakefiles/innobase -> storage/innobase/cmakelists.txt extra/yassl/cmakelists.txt: Rename: win/cmakefiles/yassl -> extra/yassl/cmakelists.txt extra/yassl/taocrypt/cmakelists.txt: Rename: win/cmakefiles/taocrypt -> extra/yassl/taocrypt/cmakelists.txt BitKeeper/deleted/.del-deploy.bat~f6b42340: Delete: win/cmakefiles/deploy.bat
* README:unknown2006-03-151-0/+75
| | | | | | | new file
* sql:unknown2006-03-151-2/+2
| | | | | | | | removed double entries for sql_yacc.* and added -p MYSQL define to call to bison win/cmakefiles/sql: removed double entries for sql_yacc.* and added -p MYSQL define to call to bison
* base:unknown2006-03-131-3/+3
| | | | | | | | Fixed problem where taocrypt was defined too early in the process win/cmakefiles/base: Fixed problem where taocrypt was defined too early in the process
* Some cmake script fixesunknown2006-03-037-14/+12
| | | | | | | | | | | | | | | | | win/cmakefiles/client: fix dependencies win/cmakefiles/libmysql: fix dependencies win/cmakefiles/regex: removed definitions defined here. They are defined globally win/cmakefiles/strings: removed definitions defined here. They are defined globally win/cmakefiles/tests: fixed dependencies win/cmakefiles/vio: removed definitions defined here. They are defined globally win/cmakefiles/zlib: removed definitions defined here. They are defined globally
* Windows compile fixes.unknown2006-02-281-1/+1
| | | | | | | | | win/cmakefiles/mysys: Remove no longer existing source file from list. sql/log_event.cc: Fix byte * <-> char * Windows build problem. VC++Files/mysys/mysys.vcproj: Remove no longer existing source file from list.
* Add CMake targets for missing stuff for release build.unknown2006-02-247-2/+88
|
* Merge mysqldev@win2003-x86:my/mysql-5.1-newunknown2006-02-223-4/+34
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/mysql/tmpbuild-5.1 mysql-test/mysql-test-run.pl: Auto merged win/cmakefiles/sql: Auto merged
| * Changes to make testsuite run in CMake build tree.unknown2006-02-102-2/+32
| |
| * Explicit cscript.exe execution of .js files.unknown2006-02-101-2/+2
| |
* | BUG #15408 - Partitions: subpartition names are not uniqueunknown2006-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libmysqld/Makefile.am: changed name to partition_info.cc mysql-test/r/partition_mgm_err.result: added drop table for previous test mysql-test/t/partition_mgm_err.test: added drop table for previous test sql/Makefile.am: reformatted a bit changed name of partition_info.cpp to partition_info.cc sql/partition_element.h: updated copyright date sql/partition_info.cc: minor corrections as a result of review sql/partition_info.h: updated copyright date sql/sql_partition.cc: updated file comment and fixed some spacing sql/sql_partition.h: updated copyright date win/cmakefiles/sql: changed name to partition_info.cc
* | BUG#15408: Partitions: subpartition names are not uniqueunknown2006-02-161-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, moved some of the code out of handler.h and into partition specific files for better separation. Also, moved some of the C funcs into partition_info as formal C++ methods mysql-test/r/partition_mgm_err.result: result block for test of bug # 15408 mysql-test/t/partition_mgm_err.test: test for duplicate subpartition names sql/Makefile.am: adding sql_partition.h, partition_info.cpp, partition_info.h, and partition_element.h to the makefile sql/ha_partition.cc: using the new members of partition_info sql/ha_partition.h: using the new members of partition_info sql/handler.h: moved this code into sql_partition.h sql/mysql_priv.h: including sql_partition.h also now sql/opt_range.cc: using the new members of partition_info sql/sql_partition.cc: moved some of the functions out and into the partition_info class using the new members of partition_info sql/sql_show.cc: using the new members of partition_info win/cmakefiles/sql: added partition_info.cpp to the sql cmake file sql/partition_element.h: New BitKeeper file ``sql/partition_element.h'' sql/partition_info.h: New BitKeeper file ``sql/partition_info.h'' sql/sql_partition.h: New BitKeeper file ``sql/sql_partition.h''
* added cmake file for instance managerunknown2006-02-083-2/+18
| | | | | win/cmakefiles/im: New BitKeeper file ``win/cmakefiles/im''
* cmakefiles cleanupunknown2006-02-084-27/+53
| | | | | | | | | | | win/cmakefiles/base: add flag for diabling insecure crt functions warning win/cmakefiles/client: add dependency to GenError to make sure the error files are made win/cmakefiles/extra: add custom target to run comp_err win/cmakefiles/sql: removed comp_err stuff.
* cmake corrections to fix compiling on visual 7.1unknown2006-02-0711-68/+84
|
* a few corrections necessary for the win32 folder renameunknown2006-01-315-6/+16
| | | | | | | | | | | | | win/build-vs71.bat: fixed call out to deploy.bat win/build-vs8.bat: fixed call out to deploy.bat win/cmakefiles/base: changed win32 to win win/cmakefiles/sql: use proper win folder for path win/configure.js: this file should be called from the root so we need to use the path
* change win32 to winunknown2006-01-312-6/+6
|
* initial cmake fileset. It is not production ready but stable enough to ↵unknown2006-01-3123-0/+779
start working with win/build-vs71.bat: batch file to build project files for Visual Studio 2003 win/build-vs8.bat: batch file to build project files for Visual Studio 2005 win/cmakefiles/base: cmakefile that will later be moved into the target directory win/cmakefiles/bdb: cmakefile that will later be moved into the target directory win/cmakefiles/client: cmakefile that will later be moved into the target directory win/cmakefiles/dbug: cmakefile that will later be moved into the target directory win/cmakefiles/deploy.bat: cmakefile that will later be moved into the target directory win/cmakefiles/extra: cmakefile that will later be moved into the target directory win/cmakefiles/heap: cmakefile that will later be moved into the target directory win/cmakefiles/innobase: cmakefile that will later be moved into the target directory win/cmakefiles/myisam: cmakefile that will later be moved into the target directory win/cmakefiles/myisammrg: cmakefile that will later be moved into the target directory win/cmakefiles/mysys: cmakefile that will later be moved into the target directory win/cmakefiles/regex: cmakefile that will later be moved into the target directory win/cmakefiles/sql: cmakefile that will later be moved into the target directory win/cmakefiles/strings: cmakefile that will later be moved into the target directory win/cmakefiles/taocrypt: cmakefile that will later be moved into the target directory win/cmakefiles/vio: cmakefile that will later be moved into the target directory win/cmakefiles/yassl: cmakefile that will later be moved into the target directory win/cmakefiles/zlib: cmakefile that will later be moved into the target directory win/config-handlerton.js: javascript file for updating handlerton.cc based on configure options win/config-version.js: javascript file for updating mysql_version.h based on configure.in data win/configure.js: basic configure javascript
View Lorry Controller Status