Commit graph

303 commits

Author SHA1 Message Date
pem@mysql.com
015ab71a50 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
2006-03-03 12:03:27 +01:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
knielsen@mysql.com
deebd0ef3b Windows compile fixes. 2006-02-28 13:21:35 +01:00
knielsen@mysql.com
19c4ba39c4 Windows compile fixes. 2006-02-28 12:52:38 +01:00
SergeyV@selena.
01f65c7bb6 project files update for win32 build 2006-02-27 16:30:14 +03:00
kent@mysql.com
eda13fe08b example.vcproj:
Bug#17721, hang in exampledb, solved by msvensson
drop-on-restart.inc:
  Added drop of tables t00,t03,t04
2006-02-27 02:56:34 +01:00
kent@mysql.com
1bc614f204 log_event.cc:
Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
  Only build mysqlserver.lib if embedded target
2006-02-26 01:16:11 +01: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
a50023d772 mysqlimport.c:
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
2006-02-18 08:46:18 +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
SergeyV@selena.
89785ddb89 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00001-mysql-5.1
2006-02-13 17:11:03 +03: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
SergeyV@selena.
b9b6269322 Fixes bug #17202. Added files to allow fulltext plugin example to be built on win32. 2006-02-09 19:34:41 +03:00
knielsen@mysql.com
56d44ff1f9 Merge mysql.com:/usr/local/mysql/mysql-5.1-win-fixes
into  mysql.com:/usr/local/mysql/x/mysql-5.1-new
2006-01-30 17:57:20 +01:00
knielsen@mysql.com
bfe989671f Merge mysql.com:/usr/local/mysql/mysql-5.0-merge
into  mysql.com:/usr/local/mysql/mysql-5.1-merge
2006-01-30 15:05:31 +01:00
knielsen@mysql.com
2aea45b810 Fix mysqlslap.vcproj dependencies also for Release and classic configuration. 2006-01-30 14:10:12 +01:00
knielsen@mysql.com
899fc2653d Windows compile fixes in preparation for 5.1.6 beta. 2006-01-30 13:09:08 +01:00
SergeyV@selena.
3c40089b9d Fixes a build problem of mysqlslap by adding a dependency to mysqlclient & mysys 2006-01-26 15:23:53 +03:00
SergeyV@selena.
b4055d2486 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1
2006-01-20 18:40:02 +03:00
SergeyV@selena.
94b26428c3 Changes to make mysqlslap buildable and runable on win32. 2006-01-16 19:35:01 +03:00
knielsen@mysql.com
e5598d2fad Windows Visual Studio 2003 fixes. 2006-01-16 09:56:10 +01:00
knielsen@mysql.com
12cb3f4c5e Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
knielsen@mysql.com
d4c6aff386 Cleanup "make dist" and Windows builds after push of pluggable storage engines. 2005-12-22 13:18:06 +01:00
kent@mysql.com
17f293fd97 mysql-test-run.pl:
Don't run "mysqlslap" on Windows
mysqlslap.test:
  We don't run "mysqlslap" on Windows
mysql.sln:
  Removed build of "client/mysqlslap.c" on Windows
2005-12-21 06:02:04 +01:00
kent@mysql.com
2205d1b8d5 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file
2005-12-19 01:12:11 +01:00
jimw@mysql.com
692a5ebbf9 Update BDB project file for Windows build 2005-12-06 09:54:28 -08:00
jimw@mysql.com
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 13:51:23 -08:00
jimw@mysql.com
0597c510c8 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-11-30 12:17:01 -08:00
aivanov@mysql.com
6680d33a4c Changed mysqld.dsp to avoid compilation error in VC++ 2005-11-28 22:15:43 +03: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
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
SergeyV@selena.
95e0c72eb2 Fixed number of compiler errors on win32. 2005-11-14 15:19:52 +03:00
reggie@ndbmaster.mysql.com
c1038ded6a myisammrg.vcproj, myisam.vcproj, innobase.vcproj, heap.vcproj, bdb.vcproj:
updated include directory after move to storage directory
mysql.sln:
  updated locations of storage engines
myisam.vcproj:
  Rename: VC++Files/myisam/myisam.vcproj -> VC++Files/storage/myisam/myisam.vcproj
heap.vcproj:
  Rename: VC++Files/heap/heap.vcproj -> VC++Files/storage/heap/heap.vcproj
innobase.vcproj:
  Rename: VC++Files/innobase/innobase.vcproj -> VC++Files/storage/innobase/innobase.vcproj
myisammrg.vcproj:
  Rename: VC++Files/myisammrg/myisammrg.vcproj -> VC++Files/storage/myisammrg/myisammrg.vcproj
bdb.vcproj:
  Rename: VC++Files/bdb/bdb.vcproj -> VC++Files/storage/bdb/bdb.vcproj
2005-11-06 00:20:38 +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
kent@mysql.com
a345a438bb mysql.sln:
Missing yaSSL added to pro-gpl target
2005-10-15 14:37:08 +02:00
lenz@mysql.com
de2d8bd73a Merge mysql.com:/data0/mysqldev/my/mysql-5.0
into mysql.com:/data0/mysqldev/my/mysql-5.0-release
2005-10-14 10:54:59 +02:00
monty@mysql.com
4561014afa Fixed compile errors on windows 2005-10-14 11:44:46 +03:00
kent@mysql.com
a662bbe132 .del-mysqlwatch.vcproj~91c7061bceb731ad:
Delete: VC++Files/mysqlwatch/mysqlwatch.vcproj
.del-mysqlshutdown.vcproj~b956e6769cf4fe76:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.vcproj
.del-pack_isam_ia64.dsp~6172aec32da6de5d:
  Delete: VC++Files/pack_isam/pack_isam_ia64.dsp
.del-pack_isam.vcproj~82b3c430c0c623f2:
  Delete: VC++Files/pack_isam/pack_isam.vcproj
.del-pack_isam.dsp~1f236852e0bcc13d:
  Delete: VC++Files/pack_isam/pack_isam.dsp
.del-isamchk_ia64.dsp~abb473e7d3025305:
  Delete: VC++Files/isamchk/isamchk_ia64.dsp
.del-isamchk.vcproj~19838e6a73320284:
  Delete: VC++Files/isamchk/isamchk.vcproj
.del-isamchk.dsp~6349525f4cf767a4:
  Delete: VC++Files/isamchk/isamchk.dsp
.del-isam_ia64.dsp~e6dffc47e113891:
  Delete: VC++Files/isam/isam_ia64.dsp
.del-isam.vcproj~53282403e12348c3:
  Delete: VC++Files/isam/isam.vcproj
.del-isam.dsw~c64a212cb134161a:
  Delete: VC++Files/isam/isam.dsw
.del-isam.dsp~9c26247a621084bf:
  Delete: VC++Files/isam/isam.dsp
mysql.sln:
  Removed isam from Visual Studio .Net project files, accidently merged over from 4.1
2005-10-14 03:19:22 +02:00
kent@mysql.com
d0922679e0 Merge 2005-10-13 14:35:53 +02:00
kent@mysql.com
c1de265163 mysqlwatch.vcproj:
Removed Debug target not used
mysql.sln:
  Added pro-gpl target
  Build mysqlwatch and mysqlshutdown for classic as well
2005-10-11 22:34:40 +02:00
kent@mysql.com
ab8abdb85c Many files:
Added Visual Studio .Net targets and 'vcproj' files for "isam",
  "isamchk", "mysqlshutdown", "mysqlwatch" and "pack_isam"
2005-10-11 01:07:50 +02: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
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
kent@mysql.com
538aaa96eb mysqld.vcproj:
Removed "examples/" from path to "ha_archive.cc"
2005-10-01 21:05:09 +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