msvensson@shellback.(none)
01faaacd25
Import from yaSSL
2006-05-05 10:33:04 +02:00
msvensson@neptunus.(none)
7aba56f452
Use "const char*" for variable found, forte complains "Cannot use const char* to initialize char*" otherwise
2006-05-03 17:55:30 +02:00
msvensson@neptunus.(none)
3dc1365b02
Merge 192.168.0.20:mysql/my50-maint-yassl
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-03 13:24:06 +02:00
msvensson@shellback.(none)
bb5c6d4382
Add original unmodified certs file
2006-05-03 13:20:51 +02:00
msvensson@shellback.(none)
987c85adb5
Add certs/ file
2006-05-03 13:11:04 +02:00
msvensson@shellback.(none)
e2854b8a7f
Update yaSSL to version 1.3.0
2006-05-03 13:08:24 +02:00
msvensson@neptunus.(none)
cccc2c4b6a
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-28 08:33:42 +02: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)
d3fa8c519c
Merge 192.168.0.20:mysql/my50-maint-yassl/
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-26 18:19:35 +02:00
msvensson@shellback.(none)
06be3a2b87
Move inclusion of "ripemd.hpp" from yassl to taocrypt
2006-04-26 18:10:14 +02:00
msvensson@shellback.(none)
e6fedbdb39
Import from upstream yassl
2006-04-26 15:29:52 +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@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
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
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
tomas@poseidon.ndb.mysql.com
16edce1e5d
Bug #17235 perror prints wrong prefix for ndb error codes
2006-02-08 17:17:27 +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
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
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
serg@serg.mylan
3595c81bc8
compatibility fix for yassl
2005-12-02 21:40:50 +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
anozdrin@mysql.com
1d1fd3d459
Make it buildable with -ansi flag on some platforms.
2005-11-24 18:42:39 +03:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
kent@mysql.com
b269caecb1
Additional "make distcheck" changes specific to 5.0
2005-11-09 11:56:04 +02:00
msvensson@neptunus.(none)
b34fbd8629
Bug#13957 yassl: opensrv6c compile failure
...
- Added some ifdefs and turn off auto template instantiation, use explicit template instantiation
2005-11-03 10:37:49 +01:00
msvensson@neptunus.(none)
3c696721f6
Update after merge, include libtaoint-integer.o into libtaocrypt.a
2005-10-28 17:12:30 +02:00
msvensson@neptunus.(none)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +02:00
msvensson@neptunus.(none)
bb571de368
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea26f5e2ea
Had to revert change, because it breaks compilation for
...
Netware. Hartmut informed about this.
2005-10-14 09:32:30 +03:00
tomas@poseidon.ndb.mysql.com
99d1d975d0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-06 10:59:58 +02:00
jimw@mysql.com
83330214e2
Merge mysql.com:/home/jimw/my/mysql-5.0-13071
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-10-05 10:07:04 -07:00
jimw@mysql.com
6b476cf5cd
Fail when two messages exist for the same language for an error in the
...
server error messages file. (Bug #13071 )
2005-10-05 10:06:31 -07:00
tomas@poseidon.ndb.mysql.com
b5ac7f31e5
added structured ndbd exit codes
2005-10-03 20:04:44 +02:00
hartmut@mysql.com
16cd4bd332
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-09-30 18:16:57 +02:00
hartmut@mysql.com
95525485b2
CygWin build fix (Bug #13640 )
2005-09-30 18:06:38 +02:00
msvensson@neptunus.(none)
39dde505fd
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13163/my50-bug13163
2005-09-27 16:36:14 +02:00
msvensson@neptunus.(none)
e0b4e273f6
Bug #13163 yassl: aix52 crash with ssl turned on
...
- It seems like malloc(0) returns a null pointer on aix52
2005-09-27 16:34:49 +02:00
msvensson@neptunus.(none)
fa554264ff
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13476/my50-bug13476
2005-09-27 11:34:11 +02:00
msvensson@neptunus.(none)
69eac2e42d
Bug #13476 yassl: openserv compile failure
2005-09-26 12:25:08 +02:00
msvensson@neptunus.(none)
306dcf0620
Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-09-22 12:29:11 +02:00
msvensson@neptunus.(none)
139601f997
Bug #13164 yassl: "SSL connection error" on several platforms
...
- it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system.
- Added a fix that tries to open /dev/random if /dev/urandom is not available.
2005-09-22 12:19:09 +02:00
msvensson@neptunus.(none)
a9b3767874
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
2005-09-15 11:24:28 +02:00
msvensson@neptunus.(none)
872d85dabe
Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL)
...
-Applied patch from Todd
2005-09-15 09:46:10 +02:00
msvensson@neptunus.(none)
95197f39a2
Bug #12526 yassl: Crashes in "integer.cpp"
...
- Disable inlining in integer.cp for sparc solaris Cun C++ 5.6
2005-09-15 08:59:29 +02:00
msvensson@neptunus.(none)
c4f5e7f1f9
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050913150614|63378
2005-09-14 10:34:45 +02:00
msvensson@neptunus.(none)
6d99d18876
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-13 18:01:27 +02:00
msvensson@neptunus.(none)
47a5c451ca
BUG#12526 yassl: Crashes in "integer.cpp"
...
- Avoid problem with "Sun C++ 5.6 2004/07/15"
2005-09-13 17:06:14 +02:00
kent@mysql.com
1313a30c83
innochecksum.c:
...
Changed from C++ comments to C comments
Did some adaption to MySQL Coding Style
2005-09-13 02:31:47 +02:00
jan@hundin.mysql.fi
cbc0f19566
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-09-12 10:57:42 +03:00
paul@snake-hub.snake.net
7331526a62
comp_err.c:
...
Fix some comments.
2005-09-10 12:31:57 -05:00
jan@hundin.mysql.fi
2097f1427b
Fix compiler errors on InnoDB offline checksum tool innochecksum.
2005-09-08 15:47:21 +03:00
msvensson@neptunus.(none)
815941fd46
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
2005-09-08 12:18:09 +02:00
msvensson@neptunus.(none)
60e3c3be0b
yassl fix for ia64 + icc
2005-09-08 11:36:12 +02:00
msvensson@neptunus.(none)
ae180d81d6
Bug #12987 yassl: Compilation of integer.cpp fails on OS X Tiger
2005-09-07 17:04:22 +02:00
msvensson@neptunus.(none)
1cc371d0e9
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
2005-09-06 21:12:09 +02:00
msvensson@neptunus.(none)
ab4f766c32
Bug #12715 Compilation of yassl/algebra.ccp fails on buildqnx2
...
- Workaround
2005-09-06 18:57:21 +02:00
serg@serg.mylan
db877e9bf1
comment out innochecksum until fixed
2005-09-06 09:36:32 +02:00
jan@hundin.mysql.fi
fc4fea68ad
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/new/mysql-5.0
2005-09-05 08:35:58 +03:00
msvensson@neptunus.(none)
68778715ae
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286
2005-09-01 14:47:06 +02:00
msvensson@neptunus.(none)
e6b282d9f8
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-01 14:09:23 +02:00
msvensson@neptunus.(none)
6fb7881f06
Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc
...
- Temporary fix, disable x86 assembler.
2005-09-01 14:07:45 +02:00
msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
7b7188cea6
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-08-26 15:56:52 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
jimw@mysql.com
d1db84639c
Build YASSL libraries with libtool so correct PIC settings are used
...
automatically. (Bug #12324 )
2005-08-11 12:26:17 -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
georg@lmy002.wdf.sap.corp
f09d06102a
fix for bug#5650 ('replace' does not follow symlinks)
...
fix now checks if the original (from) file is a symlink and uses the
link name. This prevents creation of a new file (and loss of symlink)
when renaming the tempfile.
2005-07-26 07:41:32 +02:00
jan@hundin.mysql.fi
5607acde81
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/new/mysql-5.0
2005-07-20 13:47:05 +03:00
jimw@mysql.com
80c1c6b33f
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 11:05:49 -07:00
tulin@dl145b.mysql.com
1c2cfd80a2
perror.c:
...
BUG#11999, incorrect --help on perror with ndb
2005-07-19 11:52:24 +02:00
jan@hundin.mysql.fi
6aeca28a96
Added InnoDB offline file checksum utility.
2005-07-19 10:03:19 +03: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
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
svoj@mysql.com
9359cec4ca
WL#2286 - Compile MySQL w/YASSL support
...
Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.
2005-07-01 20:00:59 +05:00
georg@lmy002.wdf.sap.corp
813b077105
Fix for Intel compiler
2005-06-27 09:36:43 +02:00
svoj@mysql.com
b720c6e535
WL#2286 - Compile MySQL w/YASSL support
...
Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.
2005-06-23 16:04:10 +05:00
svoj@mysql.com
74373e7d54
WL#2286 - Compile MySQL w/YASSL support
...
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
2005-06-22 14:08:28 +05:00
svoj@mysql.com
7660f609e6
WL#2286 - Compile MySQL w/YASSL support
...
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.
Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
2005-06-19 21:46:44 +05:00
konstantin@mysql.com
7602e1591f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-06-16 16:36:53 +04:00
svoj@mysql.com
841b232d44
WL#2286 - Compile MySQL w/YASSL support
...
Merge with latest yaSSL.
2005-06-16 16:35:09 +05:00
konstantin@mysql.com
aa5c66323d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-06-16 13:56:10 +04:00
konstantin@mysql.com
a13597604b
gcc 2.96 fixes (workarounds for compiler bugs in namespace handling)
2005-06-15 02:57:23 +04:00
svoj@mysql.com
8c9b9d0bc1
WL#2286 - Compile MySQL w/YASSL support
...
Fix for link failures on boxes with non-gnu compiler.
Fix for compilation failure on hpux11.
2005-06-15 01:39:58 +05:00
svoj@mysql.com
35dad7352d
Merge
2005-06-11 15:48:11 +05:00