Commit graph

258 commits

Author SHA1 Message Date
aivanov@mysql.com
6680d33a4c Changed mysqld.dsp to avoid compilation error in VC++ 2005-11-28 22:15:43 +03:00
SergeyV@selena.
95e0c72eb2 Fixed number of compiler errors on win32. 2005-11-14 15:19:52 +03:00
konstantin@mysql.com
7a57b741ca Hastily fix VC++6 project files to include a new file. 2005-10-18 01:35:08 +04:00
kent@mysql.com
a345a438bb mysql.sln:
Missing yaSSL added to pro-gpl target
2005-10-15 14:37:08 +02:00
lenz@mysql.com
de2d8bd73a Merge mysql.com:/data0/mysqldev/my/mysql-5.0
into mysql.com:/data0/mysqldev/my/mysql-5.0-release
2005-10-14 10:54:59 +02:00
monty@mysql.com
4561014afa Fixed compile errors on windows 2005-10-14 11:44:46 +03:00
kent@mysql.com
a662bbe132 .del-mysqlwatch.vcproj~91c7061bceb731ad:
Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
.del-pack_isam_ia64.dsp~6172aec32da6de5d:
  Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
.del-pack_isam.vcproj~82b3c430c0c623f2:
  Delete: VC++Files/pack_isam/pack_isam.vcproj
.del-pack_isam.dsp~1f236852e0bcc13d:
  Delete: VC++Files/pack_isam/pack_isam.dsp
.del-isamchk_ia64.dsp~abb473e7d3025305:
  Delete: VC++Files/isamchk/isamchk_ia64.dsp
.del-isamchk.vcproj~19838e6a73320284:
  Delete: VC++Files/isamchk/isamchk.vcproj
.del-isamchk.dsp~6349525f4cf767a4:
  Delete: VC++Files/isamchk/isamchk.dsp
.del-isam_ia64.dsp~e6dffc47e113891:
  Delete: VC++Files/isam/isam_ia64.dsp
.del-isam.vcproj~53282403e12348c3:
  Delete: VC++Files/isam/isam.vcproj
.del-isam.dsw~c64a212cb134161a:
  Delete: VC++Files/isam/isam.dsw
.del-isam.dsp~9c26247a621084bf:
  Delete: VC++Files/isam/isam.dsp
mysql.sln:
  Removed isam from Visual Studio .Net project files, accidently merged over from 4.1
2005-10-14 03:19:22 +02:00
kent@mysql.com
d0922679e0 Merge 2005-10-13 14:35:53 +02:00
kent@mysql.com
c1de265163 mysqlwatch.vcproj:
Removed Debug target not used
mysql.sln:
  Added pro-gpl target
  Build mysqlwatch and mysqlshutdown for classic as well
2005-10-11 22:34:40 +02:00
kent@mysql.com
ab8abdb85c Many files:
Added Visual Studio .Net targets and 'vcproj' files for "isam",
  "isamchk", "mysqlshutdown", "mysqlwatch" and "pack_isam"
2005-10-11 01:07:50 +02:00
konstantin@mysql.com
2c7505b263 Remove protocol_cursor.cpp (no longer used) from sources
Fix a compile failure
2005-10-09 14:45:08 +04:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
kent@mysql.com
538aaa96eb mysqld.vcproj:
Removed "examples/" from path to "ha_archive.cc"
2005-10-01 21:05:09 +02:00
kent@mysql.com
c72092bdab Many files:
Revert back 5.0 changes to Visual Studio .Net project files
2005-09-30 16:44:31 +02:00
kent@mysql.com
7b2e04d5a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-09-30 16:37:02 +02:00
kent@mysql.com
664503deca Removed all Visual Studio .Net .vcproj files to be able to
back-port to 4.1 and merge forward to 5.x again properly.
2005-09-30 16:33:27 +02:00
kent@mysql.com
21cf818a8d Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
2005-09-30 14:03:55 +02:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
joerg@mysql.com
cb77a6accb Fixes needed to build 5.0.13 on Windows:
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
2005-09-22 18:57:07 +02:00
serg@serg.mylan
a083ff160e merged 2005-09-21 13:53:22 +02:00
reggie@fedora.(none)
93e5a46c5d More fixes to the VC 7.1 solution and vcproj files 2005-09-19 23:23:23 -05:00
reggie@fedora.(none)
5c6df6a282 hopefully final set of changes to the libmysqld targets 2005-09-16 22:51:34 -05:00
reggie@fedora.(none)
b7b3012ddc more fixes to the vcproj build process 2005-09-16 20:07:39 -05:00
SergeyV@selena.
2e9e0b33c5 Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating
a restriction to 255 chars for editable buffer.
2005-09-16 01:56:16 +04:00
reggie@fedora.(none)
66e6453e2a some last minute Windows compile fixes and makefile corrections 2005-09-15 14:32:01 -05:00
reggie@linux.site
eced05c3cd A few changes to fix compiling on Windows 2005-09-06 18:06:06 -06:00
SergeyV@selena.
3fdd500288 Fixes bug #11815. Convert file path to UNIX format to build correct query
string while replicating LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
kent@mysql.com
64c2d24978 libmysqld.vcproj:
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
2005-08-25 23:24:43 +02:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
kent@mysql.com
7933906325 mysqld.dsp:
Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
2005-08-18 17:29:24 +02:00
reggie@monster.
03060be40f Some changes to project files
str_alloc had been added but was not added to mysqlclient and strings
libmysql should have had strings as a dependent.
2005-08-09 14:48:43 -05:00
kent@mysql.com
d17a4773b4 mysqld.dsp:
Added the blackhole storage engine to the Max builds
2005-08-04 13:47:02 +02:00
jimw@mysql.com
97797d91fb Merge mysql.com:/home/jimw/my/mysql-5.0-7003
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:09 -07:00
reggie@fedora.(none)
5a0250c349 Conversions of dsp files to vcproj. These files are compatible with
Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.
2005-08-02 18:47:02 -05:00
igor@rurik.mysql.com
f4c1b3bae4 Merge 2005-07-31 02:44:18 -07:00
lenz@mysql.com
c36a0fa5ac - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c
(thanks to JoergB for spotting it)
2005-07-29 12:37:27 +02:00
hf@deer.(none)
d72a837029 Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-22 12:18:19 +05:00
hf@deer.(none)
62aad2bcd0 merging 2005-07-22 12:15:09 +05:00
hf@deer.(none)
ea81d5eaa3 Fix for bug #12042 (User breakpoints calling free() in embedded library) 2005-07-21 17:17:46 +05:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
2005-07-18 15:33:18 +03:00
kent@mysql.com
aab8220342 Merge 2005-07-13 02:39:23 +02:00
kent@mysql.com
601e872848 Merge 2005-07-08 15:52:15 +02:00
kent@mysql.com
f65323bd08 mysql_client_test.dsp:
Corrected libs and lib search path for debug target
2005-07-08 15:36:57 +02:00
jimw@mysql.com
f5f434cf9f Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-06 19:05:36 -07:00
jimw@mysql.com
f1ac600a7e Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-06 16:49:04 -07:00
kent@mysql.com
21876e0ada Merge 2005-07-06 16:42:16 +02:00
kent@mysql.com
8b2ee5b11e mysql-test-run.pl:
Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories
2005-07-06 16:17:32 +02:00
kent@mysql.com
fab90ce856 mysqld.dsp:
Corrected quoting of string "pro-nt"
2005-06-28 04:37:01 +02:00
jimw@mysql.com
409592e652 Add my_str_malloc and _free function pointers to strings library
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)
2005-06-24 13:41:33 -07:00