Commit graph

374 commits

Author SHA1 Message Date
stewart@mysql.com
45d7e75cb7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
2006-06-16 18:54:20 +10:00
msvensson@neptunus.(none)
4fcf32909a Bug#19191 Repeated crashes on OpenBSD for ssl test cases
- Import patch from yaSSL
2006-06-14 21:30:49 +02:00
msvensson@neptunus.(none)
4ec47c9c73 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-06-14 13:45:27 +02:00
cmiller@zippy.(none)
00243ac847 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
2006-06-13 16:06:35 -04:00
igor@rurik.mysql.com
70ee1c2c6e Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:23:59 -07:00
msvensson@neptunus.(none)
e4d3341d35 Import from yaSSL to fix bild problems on AIX(already fixed but was lost during last import) 2006-06-07 14:46:10 +02:00
monty@mysql.com
e50412ef38 Re-apply missing changeset, orignally pushed by elliot
Add define YASSL_PREFIX when compiling yassl

Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and 
  'EVP_des_ede3_cbc' which were not released until server was stopped
- Those functions are used from the SQL function 'des_encrypt' and
  'des_decrypt'.

Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

- Include prefix files that renames all public functions in yaSSLs
  OpenSSL API to ya<function_name>. They will otherwise conflict
  with OpenSSL functions if loaded by an application that uses OpenSSL
  as well as libmysqlclient with yaSSL support.

Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
  
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."

Update after merge to 5.0

BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

- In function 'handle_grant_struct' when searching the memory structures for an 
  entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
  with the host passed in argument "user_from".
- A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
  memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
  that "any host" can connect. Thus is's correct to turn on allow_all_hosts
  when such a user is found. 
- Review and fix other places where host.hostname may be NULL.

BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
2006-06-06 14:21:07 +03:00
monty@mysql.com
63ed470566 Manually reapplied msvenssons changes to new BK tree:
Add definition of YASSL_PREFIX to Cmake file
Change "and" to "&&"
Remove the "static" directive SunCC can't use the function
2006-06-06 13:40:15 +03:00
msvensson@shellback.(none)
5ae586d946 Import patch for yassl 1.35
- Better check of required buffer size when processing incoming record headers
2006-06-05 15:41:29 +02:00
msvensson@shellback.(none)
b52141a8bd Add define YASSL_PREFIX when compiling yassl 2006-06-01 12:32:35 +02:00
msvensson@shellback.(none)
b33466d3dc Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and 
   'EVP_des_ede3_cbc' which were not released until server was stopped
 - Those functions are used from the SQL function 'des_encrypt' and
   'des_decrypt'.
2006-05-31 23:36:50 +02:00
msvensson@shellback.(none)
8adf77b953 Add define YASLSL_PREFIX 2006-05-31 23:06:56 +02:00
msvensson@shellback.(none)
589c94eba5 Import from yaSSL 2006-05-31 22:19:17 +02:00
msvensson@shellback.(none)
c542aa8701 Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-31 16:32:08 +02:00
msvensson@shellback.(none)
20217ba36f Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
- Include prefix files that renames all public functions in yaSSLs
   OpenSSL API to ya<function_name>. They will otherwise conflict
   with OpenSSL functions if loaded by an application that uses OpenSSL
   as well as libmysqlclient with yaSSL support.
2006-05-31 16:19:06 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf 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
2006-05-30 16:07:49 +03:00
msvensson@shellback.(none)
4ba0e7e3e9 Add new file md4.cpp to VC++ project file 2006-05-29 15:01:04 +02:00
msvensson@shellback.(none)
8f27d3dc4a Import from yaSSL 2006-05-29 14:49:51 +02:00
msvensson@shellback.(none)
4abd9c5673 Add m4.cpp to CMakeLists.txt for taocrypt 2006-05-22 21:30:34 +02:00
msvensson@shellback.(none)
5006f87178 Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-05-22 15:55:29 +02:00
msvensson@shellback.(none)
a401734c07 Import from yaSSL
Fixes for HPUX etc. 
Don't define exceptions operator new on hpux as the linker will look for the function
2006-05-22 15:49:57 +02:00
joerg@mysql.com
7acde58f60 Merge mysql.com:/M50/bug19040-5.0 into mysql.com:/M51/merge-5.1 2006-05-18 11:20:03 +02:00
joerg@mysql.com
93d1c2b307 Include "config.h" (if it exists) in all yaSSL files via their "runtime.hpp".
Fixes bug#19040 "yaSSL does not compile on AIX".
2006-05-17 19:08:18 +02:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 11:19:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-12 08:45:22 +02:00
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
msvensson@neptunus.(none)
0d3c0dfb75 Merge 192.168.0.20:mysql/my50-maint-yassl
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-08 16:38:24 +02:00
msvensson@shellback.(none)
15ec5dfeca Import from yaSSL 2006-05-05 10:35:12 +02:00
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
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@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@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