Commit graph

205 commits

Author SHA1 Message Date
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
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