Commit graph

368 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
bb9a601829 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
msvensson@pilot.blaudden
f79cd0537d Import yaSSL 2007-03-28 19:10:18 +02:00
msvensson@pilot.blaudden
f8b3241726 Set yaSSL to use same type as MySQL do for socket handles 2007-03-28 15:34:52 +02:00
msvensson@pilot.blaudden
a1e7778642 Import patch from yaSSL after fixing warnings upstream 2007-03-23 16:41:17 +01:00
msvensson@pilot.blaudden
7216b67a8c Import yassl 1.6.0 2007-03-23 11:52:25 +01:00
kent@mysql.com/kent-amd64.(none)
056356db05 Makefile.am:
Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
2007-03-22 16:53:37 +01:00
kent@mysql.com/kent-amd64.(none)
19a6a09126 Many files:
Major cleanup of old Visual Studio project files, aligning engines etc
2007-03-19 16:18:10 +01:00
tsmith@quadxeon.mysql.com
fee7ab58c6 comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning 2007-03-08 08:15:30 +01:00
msvensson@pilot.blaudden
f5778fc73e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
msvensson@pilot.blaudden
be72518031 Bug#26678 SSL tests fail on win64
- Import a patch from yaSSL CVS that uses "word" instead
of "unsigned long" in three function's that uses sizeof to find
out the word size being used. NOTE! long is 32 bit also on 
64 bit windows.
2007-02-27 14:18:12 +01:00
msvensson@pilot.blaudden
bb0948d2ef Link comp_err with zlib 2007-02-23 16:51:13 +01:00
msvensson@pilot.blaudden
05305f462b Bug #26571 Different format specifiers in errmsg.txt
- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations
2007-02-22 16:41:51 +01:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33 Fixed compiler warnings (for linux and win32 and win64)
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
6946fa682f After merge fixes
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
2007-02-21 19:38:40 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02: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@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)
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@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)
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
msvensson@neptunus.(none)
4bb6151a7a Add define for used type of third argument to 'accept' - Netware uses size_t 2007-01-22 12:34:39 +01:00
msvensson@neptunus.(none)
6db5790c2b gen_lex_hash does not need to link with odbc32*.lib 2007-01-22 10:41:36 +01:00
cmiller@zippy.cornsilk.net
896e2623eb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-11 09:43:44 -05: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
tsmith/tim@siva.hindu.god
682596d7ce Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into  siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
kent@mysql.com/kent-amd64.(none)
226a5c833f Many files:
Changed header to GPL version 2 only
2006-12-23 20:17:15 +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
msvensson@neptunus.(none)
9eb8a3fbee change all auto_ptr in yaSSL to mySTL since some lack reset 2006-12-13 23:30:20 +01:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-12-04 19:28:38 +01: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)
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)
838d1d53b4 Import version 1.50 of yaSSL 2006-11-29 09:21:37 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.0-merge
2006-11-27 21:45:16 +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
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
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
38c66b638f Netware uses size_t as socklen_t 2006-10-23 13:26:04 +02:00
msvensson@neptunus.(none)
85fb3817f7 yassl build fixes for hpux and netware 2006-10-16 18:36:33 +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)
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)
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)
64a64d0fbf Import yaSSL version 1.4.0 2006-09-25 16:40:29 +02:00
msvensson@shellback.(none)
08cdf195ce Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-09-21 12:25:35 +02:00