1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
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