Commit graph

147 commits

Author SHA1 Message Date
msvensson@pilot.mysql.com
19771b410a Fix merge error 2007-02-06 22:00:48 +01:00
msvensson@pilot.mysql.com
7006b2033e Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-06 20:23:28 +01:00
msvensson@neptunus.(none)
5f5b0e9b39 Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import
into  neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
2007-02-06 17:34:06 +01:00
msvensson@neptunus.(none)
38fa3ed693 Bug#25988 openssl_1 Test Case Fails
- Small difference in output from 'X509_NAME_Oneline' between OpenSSL and yaSSL. OpenSSL uses
   an extension that allow's the email adress of the cert holder.   
 - Imported patch for yaSSL "add email to DN output"
2007-02-06 16:28:36 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-02-06 15:46:17 +01:00
msvensson@pilot.mysql.com
544c19b3e6 Merge pilot.mysql.com:/home/msvensson/mysql/work/my50-work
into  pilot.mysql.com:/home/msvensson/mysql/work/my51-work
2007-01-29 18:48:20 +01:00
msvensson@pilot.mysql.com
26e4f2e506 Bug#25417 "/usr/bin/test" installed from yassl/taocrypt/test
- It's good to build the test programs for yaSSL to check for undefined
   symbols etc but they should not be installed by "make install"
2007-01-29 18:46:06 +01:00
msvensson@neptunus.(none)
7a8334edfb Merge neptunus.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  neptunus.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2007-01-29 17:54:41 +01:00
msvensson@neptunus.(none)
751d00c47e Import latest version of yaSSL
- Replace SawTooth copyright header with MySQL's
 - Bug#19209 Test 'rpl_openssl' hangs on Windows
 - Spurious "2013 Connection to server lost" errors fixed
   yaSSL doesn't close socket anymore, that is left to the application
2007-01-29 16:54:40 +01:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
monty@mysql.com/narttu.mysql.fi
120e3f5ee1 Avoid compiler warnings on powermacg5
Fixed compilation error when trying to compile libmysqld on powermac
2007-01-23 16:42:03 +02:00
msvensson@neptunus.(none)
cff8f55088 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2007-01-22 16:58:21 +01:00
msvensson@neptunus.(none)
1ebe4850d6 Import yaSSL version 1.5.8
- Includes patch for Bug#25189
2007-01-22 16:54:40 +01:00
monty@mysql.com/narttu.mysql.fi
a04157fbb3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729 my_strtoll10-x86.s:
Corrected spelling in copyright text
Makefile.am:
  Don't update the files from BitKeeper
Many files:
  Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
Many files:
  Added GPL copyright text
Removed files:
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/xwf
2006-12-31 01:02:27 +01:00
monty@mysql.com/narttu.mysql.fi
a6481aa4c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
monty@mysql.com/narttu.mysql.fi
88dd873de0 Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments

Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c

I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a Fixed compiler warnings
Don't assert if my_thread_end() is called twice (common case)
2006-11-30 21:56:03 +02:00
msvensson@shellback.(none)
521464755c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 19:32:36 +01:00
msvensson@shellback.(none)
97c9a7dd06 Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  shellback.(none):/home/msvensson/mysql/yassl_import/mysql-5.0-maint
2006-11-29 12:11:04 +01:00
msvensson@shellback.(none)
710e731e2f Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
2006-11-29 09:27:43 +01:00
msvensson@shellback.(none)
838d1d53b4 Import version 1.50 of yaSSL 2006-11-29 09:21:37 +01:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-28 18:31:53 +01:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.1
2006-11-27 23:12:05 +01:00
kent@mysql.com/kent-amd64.(none)
5fcb7a4ef1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 21:21:00 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86 ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:
Reenabled build outside source tree
2006-11-27 21:15:25 +01:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f Fixed a LOT of compiler warnings
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f1ec3372be Many files:
Adjuster project files to reflect move of "mySTL" directory
2006-11-23 20:04:18 +01:00
joerg@trift2.
16cb323429 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2006-11-17 16:33:11 +01:00
joerg@trift2.
0aee63517e Maintain the (old) VC project files, ehere yaSSL is concerned:
"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
2006-11-17 16:09:37 +01:00
msvensson@neptunus.(none)
b2a98c531f Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-10-16 18:40:54 +02:00
msvensson@neptunus.(none)
85fb3817f7 yassl build fixes for hpux and netware 2006-10-16 18:36:33 +02:00
msvensson@neptunus.(none)
8399b9e155 Merge neptunus.(none):/home/msvensson/mysql/work/my51-work
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-09-28 09:38:26 +02:00
msvensson@neptunus.(none)
d4799d9edd Directory mySTL has moved from extra/yassl/mySTL to extra/yassl/taocrypt/mySTL 2006-09-28 09:37:34 +02:00
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