reggie@big_geek.
67a692f998
performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
...
This is being pushed to a private tree and tested before being sent to the mainline.
2006-05-11 11:29:08 -05: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
msvensson@shellback.(none)
f52247a6e8
Fix merge error
2006-04-27 22:21:23 +02:00
msvensson@shellback.(none)
e5004d1312
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-27 17:35:29 +02:00
msvensson@neptunus.(none)
26be6ababe
Remove -Wall etc, not so portable compiler options
2006-04-21 19:53:30 +02:00
msvensson@neptunus.(none)
7af32b0748
Move telpate instantiations of taocrypt objects to taocrypt/template_instnt.cpp
2006-04-21 18:19:50 +02:00
msvensson@win2003-x86.
9bd55493d3
Fix build of taocrypt. Don't mention /GX or /EHsc as that will turn ON exception handling and not off as we want.
2006-04-20 11:59:12 +02:00
msvensson@shellback.(none)
3d61068fbe
Add the .der files used by yaSSL benchmark
2006-04-19 11:42:55 +02:00
msvensson@shellback.(none)
cd942a0fce
Add .der files, used by yaSSL benchmark
...
Add benchamrk to dirs to build
2006-04-19 11:33:49 +02:00
msvensson@shellback.(none)
a965875aaa
Import from upstream yaSSL
2006-04-19 10:21:00 +02:00
kent@mysql.com
64295d82d1
Merge
2006-04-18 17:16:27 +02:00
kent@mysql.com
de430a149e
Merge
2006-04-18 16:58:21 +02:00
msvensson@shellback.(none)
0d1bd3b1f2
Import from yaSSL upstream
2006-04-18 14:41:43 +02:00
msvensson@neptunus.(none)
c53f2320e4
Bug#18815 libmysql using yassl can't be linked with c program
...
- Apply patch to remove dependency on C++ libs when linking "libmysql" from c
2006-04-18 12:08:06 +02:00
brian@zim.(none)
6f986a344b
UNIXWARE removal
2006-04-17 15:56:59 -07:00
serg@serg.mylan
70c2ff34f7
fixes for 'make dist' and 'make distcheck'
2006-04-12 14:08:24 +02:00
msvensson@shellback.(none)
1c4e31d5fe
Add new yaSSL files
...
Add benchmark, testsuite and taocrypt/test as places where to
produce Makfiles and build - very useful for debugging
2006-04-11 23:51:14 +02:00
msvensson@shellback.(none)
e8723ca453
Update yassl to 1.2.2
2006-04-07 11:35:12 +02:00
knielsen@mysql.com
cfb43e683b
Add missing files for CMake build.
2006-03-27 11:23:50 +02:00
knielsen@mysql.com
bc6628d27f
Some changes to make it possible to build for Windows with CMake from
...
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
knielsen@mysql.com
9c84881310
Define USE_TLS when compiling libmysql.dll, to avoid crashing when
...
loaded at runtime.
2006-03-22 09:55:26 +01:00
knielsen@mysql.com
ca4ec28146
CMake Windows comp_error dependency fix after last push.
2006-03-16 15:42:48 +01:00
knielsen@mysql.com
24e29bf9d1
Fix Windows CMake dependency problem.
2006-03-16 13:30:59 +01:00
Reggie@xgeek.
11979eec94
Moved cmake scripts into the proper directories
2006-03-15 10:22:12 -06:00
konstantin@mysql.com
e1f807af26
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
tomas@poseidon.ndb.mysql.com
16edce1e5d
Bug #17235 perror prints wrong prefix for ndb error codes
2006-02-08 17:17:27 +01:00
brian@zim.tangent.org
570bffe8c7
Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup().
...
my_stat() gettinng the correct parameter list may be next :)
2006-01-25 19:54:42 -08:00
joerg@mysql.com
b2f6d4f574
Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
2006-01-16 20:21:42 +01:00
joerg@mysql.com
5da306b57e
extra/comp_err.c : Fix a merge error.
2006-01-16 17:23:39 +01:00
joerg@mysql.com
fa91e05bf5
Manual merge of the fix for bug#16106.
...
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
2006-01-16 16:48:05 +01:00
joerg@mysql.com
1155bf20d9
Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
2006-01-13 17:45:01 +01:00
joerg@mysql.com
9d4562e5fe
extra/comp_err.c + scripts/mysqld_multi.sh :
...
Copyright string fixes (bug#16106)
2006-01-13 16:25:20 +01:00
dlenev@mysql.com
15c86158a7
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
...
into mysql.com:/home/dlenev/src/mysql-5.1-merges
2005-12-24 20:13:51 +03:00
msvensson@neptunus.(none)
e50c0fdc3b
Bug #15772 Aborted YaSSL connections force threads into busyloops
...
- Report error when there is nothing to read after wait.
2005-12-20 00:47:50 +01:00
hartmut@mysql.com
7244dfd8d2
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-19 08:33:27 +01:00
jonas@perch.ndb.mysql.com
b5b0a3d6ac
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-14 14:03:50 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 09:42:05 +02:00
knielsen@production.mysql.com
1b846dc2fd
Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/usersnfs/knielsen/mysql-5.0
2005-12-14 08:24:57 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
834940e9be
Patch for Bug#13640
2005-12-14 03:08:59 +02:00
knielsen@mysql.com
bd9b379227
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0
2005-12-08 21:02:11 +01:00
knielsen@mysql.com
51cd5da314
Fix QNX and IRIX compilation
2005-12-08 15:13:25 +01:00
hartmut@mysql.com
e5b7e447ed
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-08 10:24:30 +01:00
pem@mysql.com
8e0e421943
Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 15:17:18 +01:00
hartmut@mysql.com
4c20a4da25
fixed "perror --ndb" for 5.1 (bug #15486 )
2005-12-05 14:17:53 +01:00
serg@serg.mylan
3595c81bc8
compatibility fix for yassl
2005-12-02 21:40:50 +01: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
pem@mysql.com
b2a9961abf
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-28 20:14:12 +01:00
kent@mysql.com
6430a4901e
Makefile.am:
...
Distribute "handlerton-win.cc"
mysqld.cc:
Corrected word lenght for some innobase
configuration variables
Makefile.am:
Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
Changed include to use "..." for Windows
handlerton-win.cc:
Handle engine include/exclude with defines for Windows
new file
2005-11-26 05:35:37 +01:00
msvensson@devsrv-b.mysql.com
3879027ade
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15168/my50-bug15168
...
into devsrv-b.mysql.com:/space/magnus/mysql-5.0
2005-11-25 17:01:59 +01:00
msvensson@devsrv-b.mysql.com
8f457699a8
Bug #15168 yassl failure on amd64
...
- Use libtool to build libraries
2005-11-24 17:17:36 +01:00
