1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Commit Graph

85 Commits

Author SHA1 Message Date
monty@mysql.com
3ddc1f9956 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-05-04 15:58:30 +03:00
holyfoot@deer.(none)
318aba9db1 bug #18455 (embedded server Win32 build) 2006-04-26 15:58:27 +05:00
kent@mysql.com
80fd0b3dd9 libmysqld.vcproj, mysqld.vcproj:
Include "." in header search, to find #include <lex_hash.h>
2006-04-14 19:36:06 +02:00
kent@mysql.com
b492d05ee9 Merge 2006-04-04 23:37:44 +02:00
kent@mysql.com
2cbc50c509 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
2006-04-01 02:46:32 +02:00
kent@mysql.com
9b40dabd29 vcproj files:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard
  code it into Visual Studio project files, bug#15974
2006-04-01 02:14:54 +02:00
kent@mysql.com
5d0187f0ae Makefile.am:
Change for 'make distcheck'
libmysqld.vcproj:
  Typo
2006-02-22 20:34:25 +01:00
kent@mysql.com
ed07bf13c6 mysqld.vcproj, mysqlserver.vcproj, libmysqld.vcproj:
Changed default server to include all engines except BDB
2006-02-17 19:24:47 +01:00
kent@mysql.com
edbbfee4f5 Merge 2006-02-12 20:07:19 +01:00
kent@mysql.com
633cd03468 disabled.def:
Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
  Added "my_user.c"
2006-02-12 19:36:21 +01:00
kent@mysql.com
f4ba8acb97 Many files:
Enable build on Windows
2005-11-26 19:21:49 +01:00
kent@mysql.com
708b8ff014 Fix VS project files following move of storage engines below storage/. 2005-11-25 10:46:28 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
konstantin@mysql.com
7a57b741ca Hastily fix VC++6 project files to include a new file. 2005-10-18 01:35:08 +04:00
serg@serg.mylan
2e2d18b7cf Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2005-10-09 19:10:19 +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
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +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
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
reggie@fedora.(none)
b7b3012ddc more fixes to the vcproj build process 2005-09-16 20:07:39 -05:00
reggie@fedora.(none)
66e6453e2a some last minute Windows compile fixes and makefile corrections 2005-09-15 14:32:01 -05:00
brian@zim.(none)
57403ddc9d Merge zim.(none):/home/brian/mysql/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.1

Resolved to minor issues.
2005-08-30 14:40:02 -07: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
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
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
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
hf@deer.(none)
ea81d5eaa3 Fix for bug #12042 (User breakpoints calling free() in embedded library) 2005-07-21 17:17:46 +05: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
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
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
jimw@mysql.com
5f715b52d0 Fix test_libmysqld link problem on Windows. 2005-03-21 21:51:31 +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
georg@beethoven.site
26e3685b02 Changes and fixes for windows compilation 2005-02-18 15:17:17 +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
hf@deer.(none)
eb723e0537 Fix for bug #6434 (bad memory deletion in app using libmysqld)
We should build libmysqld in SAFEMALLOC mode.
2005-01-03 18:50:51 +04:00
lenz@mysql.com
40c5b91930 - added sql_trigger.cpp to the mysqld and libmysqld project files 2004-11-18 16:36:25 +01:00
lenz@mysql.com
35c8dc935d - Added sql/parse_file.cpp and sql/sql_view.cpp to the mysqld and
libmysqld project files
2004-07-16 20:59:09 +02:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00