Commit graph

322 commits

Author SHA1 Message Date
igor@rurik.mysql.com
88b0e989b6 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-14 20:00:36 -07:00
igor@rurik.mysql.com
940fe6fea6 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-06-09 17:56:08 -07:00
igor@rurik.mysql.com
950a000503 Fixed some problems for Windows build 2006-06-06 09:59:45 -07:00
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@mysql.com
f66bcd2535 Merge mysql.com:/home/hf/work/mysql-5.0.18455
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-05-03 16:48:15 +05:00
dlenev@mysql.com
5cae540501 Merge mysql.com:/home/dlenev/mysql-5.0-bg11081
into  mysql.com:/home/dlenev/mysql-5.1-merges
2006-05-02 23:16:53 +04:00
knielsen@mysql.com
f0341ac431 Fix a bunch of non-Linux compile failures. 2006-05-02 09:19:54 +02:00
jimw@mysql.com
f21c110d13 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 13:27:38 -07:00
holyfoot@deer.(none)
5a75f865c2 bug #18115 (mysql_upgrade on Windows)
pushed in 5.0
2006-04-28 09:07:25 +05: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
jimw@mysql.com
55727ef6d0 Remove sql-bench from the server repository -- it is being maintained
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
2006-04-13 10:34:46 -07:00
jimw@mysql.com
cb051bfddc Remove Windows project files for mysql_test_run_new. 2006-04-11 18:59:43 -07:00
holyfoot@mysql.com
a5d18bc8ab Merging 2006-04-10 20:54:42 +05: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
holyfoot@deer.(none)
9bc866d9b2 bug #18115 (mysql_upgrade missing in Windows binary) 2006-03-18 17:56:24 +04:00
knielsen@mysql.com
6d7f2ff0f4 Fix example storage engine build on Windows. 2006-03-16 16:25:16 +01:00
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