Commit graph

304 commits

Author SHA1 Message Date
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
jimw@mysql.com
936755b7ee Merge mysql.com:/home/jimw/my/mysql-5.1-bdb
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-09-21 10:35:19 -07: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
msvensson@neptunus.(none)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
2005-09-14 09:43:56 +02:00
reggie@linux.site
eced05c3cd A few changes to fix compiling on Windows 2005-09-06 18:06:06 -06:00
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02: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
reggie@linux.site
6bf4e15b08 updated some vcproj files and the .sln file 2005-08-29 15:35:27 -06: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
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04: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
joerg@mysql.com
c070251abd Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-08-24 13:56:54 +02: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
joerg@mysql.com
3d9bae7b54 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.
2005-07-22 18:45:31 +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
jimw@mysql.com
6c18c133a2 Add new files to Windows bdb project file 2005-07-21 18:26:42 -07:00
joerg@mysql.com
16bfcd3c75 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.
2005-07-21 21:47:46 +02: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
jimw@mysql.com
99e35c84ac Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-20 15:02:45 -07:00
jimw@mysql.com
7e70aee169 Fix another .dsp trying to link debug binary against release version of yassl 2005-06-18 02:03:49 +02:00
jimw@mysql.com
f2b0874f80 Clean up warnings and build problems on Windows. (Bug #11045) 2005-06-18 01:55:42 +02:00
kent@mysql.com
155c322c59 mysqld.dsp:
Corrected typo
2005-06-10 04:09:42 +02:00
kent@mysql.com
b949adc289 2005-06-09 18:02:07 +02:00
kent@mysql.com
2c6616e3ff Many files:
More yaSSL changes in Visual Studio 6 project files
2005-06-09 16:53:08 +02:00
kent@mysql.com
4d0a81aa8b config-win.h:
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files
2005-06-09 05:04:59 +02:00
kent@mysql.com
0005165fa0 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name'
2005-06-09 00:49:37 +02:00
jimw@mysql.com
6b1a9f64bb Fix Windows build warning and file missing from projects. 2005-06-08 01:25:06 +02:00
lenz@mysql.com
13afa9129b Some Windows compile improvements:
- removed some unreferenced variables
 - fixed the libmysql project file by removing a duplicate file reference (merge error)
2005-06-06 15:23:04 +02:00
schwenke@lmy003.xl.local
7d6b47c994 misc. fixes for windoze builds 2005-06-02 15:32:02 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
monty@mysql.com
dac499ce7c Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0 2005-05-25 19:55:01 +03:00
lenz@mysql.com
89e4e756c8 - one more build fix for zlib.lib - added libpath to the
mysql_test_run_new project files
2005-05-25 10:55:21 +02:00
lenz@mysql.com
6083014c4c - applied more changes to enable the CP932 charset on Windows
- fixed linking with zlib
2005-05-24 22:42:43 +02:00
kent@mysql.com
bedc2e3d4c ha_archive.cc:
Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String
2005-05-24 18:51:53 +02:00
lenz@mysql.com
236ca3626f - added the cp932 charset support to the Windows builds 2005-05-24 14:46:28 +02:00
gluh@mysql.com
ce5d59d380 Merge gluh@gluh:/home/gluh/release/mysql-5.0-build
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
2005-05-24 15:35:24 +05:00
kent@mysql.com
181f21c5d2 mysqld.dsp:
Added BLACKHOLE and FEDERATED storage engines for max builds
  Some preparations for including yaSSL
ha_federated.cc:
  Use local seach path for "mysql_priv.h"
2005-05-23 21:15:00 +02:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 19:01:16 +02:00
gbichot@quadita2.mysql.com
83994a4d4c Removing mysqlshutdown and mysqlwatch from the Windows packages, removing their sources.
They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.
2005-05-23 16:50:20 +02:00
kent@mysql.com
363fd14115 default_modify.c:
Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
  New file needed, "../mysys/default_modify.c"
2005-05-21 23:23:39 +02:00
reggie@mdk10.(none)
21133df02a fixed conflicts 2005-05-20 16:34:59 -05:00
reggie@mdk10.(none)
48c584537d BUG# 9148: Denial of service
The problem was that on Windows the access method indicates that access to file 
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.

The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.
2005-05-20 16:04:10 -05:00
kent@mysql.com
318c41e94d default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c"
2005-05-18 12:15:28 +02:00
msvensson@neptunus.(none)
3416e42903 BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
jimw@mysql.com
43d926029f Add cp932 and eucjpms character sets to Windows build. (Bug #9479) 2005-04-07 09:51:56 -07:00
kent@mysql.com
2292480e79 mysqld.dsp:
Corrected wrong exe naming from bad merge
2005-04-02 03:35:28 +02:00
konstantin@mysql.com
eeeedd31b9 Manual merge 2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3 A fix for Bug#8226 "Cannot connect via shared memory":
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.
2005-03-26 01:21:52 +03:00
jimw@mysql.com
7b985df2a0 Remove references to no-longer-used MySqlManager project files 2005-03-21 23:32:27 +01:00
jimw@mysql.com
5f715b52d0 Fix test_libmysqld link problem on Windows. 2005-03-21 21:51:31 +01:00
joerg@mysql.com
f87c045e7e Merge 2005-03-11 11:21:51 +01:00
joerg@mysql.com
f610930224 Correct "make_win_src_distribution" to not introduce additional directory layers,
adapt the Windows build files accordingly.
2005-03-10 21:13:46 +01:00
serg@serg.mylan
956682de1a merged 2005-03-09 14:09:06 +01:00
georg@lmy002.wdf.sap.corp
e8e5cd5053 Various fixes for Windows 2003 Platform SDK SP1 beta 2005-03-07 13:04:05 +01:00
georg@lmy002.wdf.sap.corp
473f2f9409 New Project files for Windows Ithanium 64-bit builds 2005-03-06 14:22:28 +01:00
kent@mysql.com
c3af8b202d libmysqld.dsp:
Corrected path to my_decimal.cpp
2005-02-24 11:24:59 +01:00
reggie@mdk10.(none)
18799ea2ca Added my_mmap to mysys library
mysys.dsp:
  Added my_mmap
2005-02-23 23:10:22 -06:00
georg@beethoven.site
26e3685b02 Changes and fixes for windows compilation 2005-02-18 15:17:17 +01:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
brian@zim.(none)
29af4dffe6 Set of fixes requested by Kent in IRC. Tested (except the windows changes since I am trusting Kent...). No windows compiles here folks... 2005-02-10 19:04:38 -08:00
kent@mysql.com
9a564f832a Merge 2005-02-09 16:56:58 +01:00
wax@kishkin.ru
b93102422b WL#964
renamed client_test to mysql_client_test
    fixed name for lstat in removef()
    added mysql-debug.exe for Windows
    added enviroment variable MYSQL_CLIENT_TEST
    added cleaning directory before tests
    New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
    Delete: VC++Files/tests/client_test.dsp
2005-02-02 19:53:49 +05:00
wax@kishkin.ru
6ba40427ba WL#964
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''
2005-01-31 19:18:06 +05:00
lenz@mysql.com
bbf08df9f1 - added "../extra" to the include path of mysqltest.dsp (Windows compile
failed to find the newly introduced extra/mysqld_ername.h header file)
2005-01-27 09:05:55 +01:00
georg@beethoven.site
3b2bf2f512 Fixes for windows compilation bugs
(After review of cs georg:1.1800 by Monty)
2005-01-26 15:19:20 +01:00
hf@deer.(none)
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
lenz@mysql.com
33795908a0 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
lenz@mysql.com
a156ddd0be - Create the mysqld binaries with the correct file names during the build
instead of renaming them in the packaging stage with Do-win-build later:
  mysqld-opt.exe -> mysqld.exe, mysqld.exe -> mysqld-debug.exe
2005-01-11 15:41:42 +01:00
hf@deer.(none)
7ddb951984 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.7330
2005-01-11 16:10:06 +04:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00
kent@mysql.com
de85fdb78f mysql_test_run_new.dsp:
Link mysql_test_run_new as console application
my_manage.c:
  The type intptr_t isn't defined for VC 6.0
  Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
  The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
  Added regex to additional build types for mysqltest
mysqldump.dsp:
  Added mysys.lib for linking mysqldump
2005-01-04 23:07:29 +01:00