Commit graph

226 commits

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