mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
58431 commits 2781 branches 343 tags 1.6 GiB
Commit graph

263 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
912075ba4d Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-27 17:00:25 +02:00
msvensson@neptunus.(none)
593fdc3f9b The mySTL directory has moved from yassl/mySTL to yassl/taocrypt/mySTL 2006-09-27 16:51:59 +02:00
msvensson@neptunus.(none)
161b64def2 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-27 16:47:59 +02:00
msvensson@neptunus.(none)
d1f7bc0971 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-09-27 16:46:38 +02:00
msvensson@neptunus.(none)
ca0b8c552a Fix compile failure on Sun C++ 5.7 in yaSSL code 
- Trying to use unctions declared as static being used from another file, change them to be inline
 2006-09-27 16:45:44 +02:00
msvensson@neptunus.(none)
312b4de035 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-27 14:44:06 +02:00
msvensson@neptunus.(none)
980268df03 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-09-27 14:38:25 +02:00
msvensson@neptunus.(none)
e4676ef60a Import yaSSL version 1.4.3 2006-09-27 14:36:12 +02:00
msvensson@neptunus.(none)
85cdcc8ea4 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-26 16:04:16 +02:00
msvensson@neptunus.(none)
bcdecd96b7 Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-09-25 16:46:37 +02:00
msvensson@neptunus.(none)
64a64d0fbf Import yaSSL version 1.4.0 2006-09-25 16:40:29 +02:00
msvensson@shellback.(none)
c39d8cb04d Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-21 11:38:51 +02:00
msvensson@shellback.(none)
346730ee6b Use a direct reference to the yassl and taocrypt libtool libraries to link with 2006-09-21 11:37:08 +02:00
msvensson@shellback.(none)
da8fb51350 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-18 19:40:12 +02:00
msvensson@shellback.(none)
2b014bedaf Add directive to not update files from bitkeeper 2006-09-18 19:37:22 +02:00
msvensson@shellback.(none)
e03619ce63 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 15:45:03 +02:00
msvensson@shellback.(none)
c3e2d543db Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t 2006-09-15 15:41:04 +02:00
cmiller@zippy.cornsilk.net
e5669a6527 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:53:06 -04:00
cmiller@zippy.cornsilk.net
1b60377484 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-05 13:52:06 -04:00
grichter@bk-internal.mysql.com
6993e3a3f7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
msvensson@shellback.(none)
9af6450e30 Update the generate_prefix_files.pl 2006-08-31 15:17:35 +02:00
msvensson@shellback.(none)
086fea9809 Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! 
- Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL
 2006-08-31 15:16:44 +02:00
msvensson@shellback.(none)
f368e0753e Bug #21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! 
- Correct bug in perl script that faild to add rename macros for some functions.
 2006-08-31 14:26:12 +02:00
iggy@rolltop.ignatz42.dyndns.org
a21ec5dbd4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
 2006-08-24 15:03:33 -04:00
msvensson@neptunus.(none)
2f0b080aea Bug#19810 Bundled YASSL in libmysqlclient conflicts with OpenSSL 
- Rename yaSSL version of 'SSL_peek' to 'yaSSL_peek' by using a macro
 2006-08-21 14:51:59 +02:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
msvensson@neptunus.(none)
396a51b4bc Merge 192.168.0.20:mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-01 20:39:48 +02:00
msvensson@shellback.(none)
116feb009e Import latest version of yaSSL 2006-08-01 20:20:46 +02:00
evgen@sunlight.local
ef4f149536 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
 2006-07-30 00:33:24 +04:00
jimw@rama.(none)
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-07-28 15:51:48 -07:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
345945165a sql_select.cc: 
Renamed variable, to avoid name clash with macro "rem_size"
  on AIX 5.3 and "/usr/include/sys/xmem.h" (bug#17648)
asn.cpp, asn.hpp:
  Avoid name clash with NAME_MAX
 2006-07-28 21:26:46 +02:00
evgen@moonbone.local
b7a55b9b5c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
 2006-07-18 23:45:17 +04:00
msvensson@shellback.(none)
011f57e0ec Import yaSSL version 1.3.7 
- Fix for "bug#16755 Please find a SSL library that is FLOSS-Exception / LGPL copyrighted"
 2006-07-17 10:50:20 +02:00
igor@rurik.mysql.com
b5bdc178af Fixed some dsp files. 
Fixed make_win_src_distribution.sh to return back dsp files
for yassl.
 2006-06-23 18:21:34 -07:00
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