mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41466 commits 2784 branches 343 tags 1.6 GiB
Commit graph

459 commits

Author SHA1 Message Date
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
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
brian@zim.(none)
6f986a344b UNIXWARE removal 2006-04-17 15:56:59 -07:00
serg@serg.mylan
70c2ff34f7 fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +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
knielsen@mysql.com
cfb43e683b Add missing files for CMake build. 2006-03-27 11:23:50 +02:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
knielsen@mysql.com
9c84881310 Define USE_TLS when compiling libmysql.dll, to avoid crashing when 
loaded at runtime.
 2006-03-22 09:55:26 +01:00
knielsen@mysql.com
ca4ec28146 CMake Windows comp_error dependency fix after last push. 2006-03-16 15:42:48 +01:00
knielsen@mysql.com
24e29bf9d1 Fix Windows CMake dependency problem. 2006-03-16 13:30:59 +01:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
konstantin@mysql.com
e1f807af26 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-09 13:35:59 +03: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
brian@zim.tangent.org
570bffe8c7 Rename of my_strdup_with_lenght to match the more common "strndup" method. Soo its now my_strndup(). 
my_stat() gettinng the correct parameter list may be next :)
 2006-01-25 19:54:42 -08:00
joerg@mysql.com
b2f6d4f574 Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2006-01-16 20:21:42 +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
dlenev@mysql.com
15c86158a7 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges
 2005-12-24 20:13:51 +03: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
hartmut@mysql.com
7244dfd8d2 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-19 08:33:27 +01:00
jonas@perch.ndb.mysql.com
b5b0a3d6ac Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2005-12-14 14:03:50 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61 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
 2005-12-14 09:42:05 +02: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
hartmut@mysql.com
e5b7e447ed Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
 2005-12-08 10:24:30 +01:00
pem@mysql.com
8e0e421943 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-12-07 15:17:18 +01:00
hartmut@mysql.com
4c20a4da25 fixed "perror --ndb" for 5.1 (bug #15486) 2005-12-05 14:17:53 +01:00
serg@serg.mylan
3595c81bc8 compatibility fix for yassl 2005-12-02 21:40:50 +01:00
jimw@mysql.com
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:51:23 -08:00
pem@mysql.com
b2a9961abf Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-11-28 20:14:12 +01:00
kent@mysql.com
6430a4901e Makefile.am: 
Distribute "handlerton-win.cc"
mysqld.cc:
  Corrected word lenght for some innobase
  configuration variables
Makefile.am:
  Added Visual Studio 7 project file to EXTRA_DIST
ha_partition.cc, sql_partition.cc:
  Changed include to use "..." for Windows
handlerton-win.cc:
  Handle engine include/exclude with defines for Windows
  new file
 2005-11-26 05:35:37 +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
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 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
 2005-11-23 14:57:00 +02: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
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
kent@mysql.com
b269caecb1 Additional "make distcheck" changes specific to 5.0 2005-11-09 11:56:04 +02:00
acurtis@poseidon.ndb.mysql.com
c01a3b5e5f Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +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
e72fdf5619 Merge 2005-10-07 01:12:46 +02: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
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +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)
7acbf0d24f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029
 2005-09-15 11:26:37 +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)
b92a933dfe Merge neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029 
into  neptunus.(none):/home/msvensson/mysql/bug13029/my51-bug13029
 2005-09-15 09:47:30 +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)
dc0e1d83e1 Merge neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my51-bug12526
 2005-09-15 09:09: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)
fb63290635 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new 
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
 2005-09-14 09:43:56 +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
ndbdev@dl145c.mysql.com
4e8595862d Merge 2005-09-13 05:33:11 +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
tulin@dl145c.mysql.com
a29132cdc5 Merge 2005-09-12 14:22:06 +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
c6501cfc0c Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2005-09-10 12:54:59 -05:00
paul@snake-hub.snake.net
7331526a62 comp_err.c: 
Fix some comments.
 2005-09-10 12:31:57 -05:00
ndbdev@dl145b.mysql.com
46cc62e216 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-09-09 15:26:47 +02: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)
84a1c7562a Merge neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715 
into  neptunus.(none):/home/msvensson/mysql/bug12715/my51-bug12715
 2005-09-06 20:30:47 +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
msvensson@neptunus.(none)
3e2f0d16b4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-06 18:08:21 +02:00
serg@serg.mylan
db877e9bf1 comment out innochecksum until fixed 2005-09-06 09:36:32 +02:00
ndbdev@dl145c.mysql.com
f40c1576b0 Merge 2005-09-06 09:20:15 +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)
345dfef41f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2005-09-02 08:59:59 +02: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
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +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
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-25 13:11:38 -04: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
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-05 18:01:34 -04: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
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02: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
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00