mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34024 commits 2791 branches 343 tags 1.7 GiB
Commit graph

34024 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot@mysql.com
2f7ac18f22 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-04 02:17:17 +05:00
pekka@mysql.com
ec42119233 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-05-03 23:17:16 +02:00
aivanov@mysql.com
7a74734219 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521
 2006-05-04 01:17:15 +04:00
aivanov@mysql.com
ac0ac6a3c9 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1
 2006-05-04 00:35:45 +04:00
aivanov@mysql.com
4cff042a58 Applied innodb-5.0-ss521 snapshot. 
Fixed BUG#19366: "consistent_snapshot.test fails".
 2006-05-04 00:32:34 +04:00
holyfoot@mysql.com
7d47127e86 Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-04 00:45:56 +05:00
aivanov@mysql.com
b695bb4624 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb/mysql-4.1-ss26
 2006-05-03 23:45:55 +04:00
aivanov@mysql.com
2f190c2c10 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work 
into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.
 2006-05-03 23:31:52 +04:00
aivanov@mysql.com
a7122276a4 Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.
 2006-05-03 23:29:27 +04:00
aivanov@mysql.com
d546f0d93e Applied innodb-4.1-ss26 snapshot. 
Fixed BUG#19366: "consistent_snapshot.test fails".
 2006-05-03 23:25:01 +04:00
holyfoot@mysql.com
e5a22d1bca Merge bk@192.168.21.1:mysql-4.1 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-04 00:03:58 +05:00
msvensson@neptunus.(none)
667435103d Check if "../libtool" is available and use it only when it is. 2006-05-03 20:04:57 +02:00
msvensson@neptunus.(none)
5feae9aa4e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-05-03 19:41:57 +02:00
monty@mysql.com
d689f2fa70 Cleanups after review of WL#602 
Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings
 2006-05-03 19:40:52 +03: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)
896704c648 Remove C++ comments 
Formatting
 2006-05-03 16:59:02 +02:00
ingo@mysql.com
f9cd0b3d95 Merge mysql.com:/home/mydev/mysql-5.0-bug10405 
into  mysql.com:/home/mydev/mysql-5.1-bug10405
 2006-05-03 16:39:14 +02:00
cmiller@zippy.(none)
b07bb71291 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
 2006-05-03 10:04:04 -04:00
holyfoot@deer.(none)
5b5db01a46 merging fix 2006-05-03 19:01:29 +05:00
cmiller@zippy.(none)
a5789854ee Added code to remove closing comment code from event text, as would be 
supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078
 2006-05-03 09:55:34 -04:00
msvensson@neptunus.(none)
7c8c14c435 Move "max-connect-retries" option to get alpabetichal order 2006-05-03 15:53:59 +02:00
serg@sergbook.mysql.com
375d3e8258 Fixed dependency checking 2006-05-03 09:46:19 -04:00
monty@mysql.com
9756d7f853 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-05-03 16:03:19 +03:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
 2006-05-03 15:59:17 +03:00
holyfoot@deer.(none)
81e625ac4a merging fix 2006-05-03 17:43:32 +05:00
msvensson@devsrv-b.mysql.com
4a755e085b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0-maint 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0-maint
 2006-05-03 14:12:38 +02:00
msvensson@neptunus.(none)
f0ac0fdf06 Add an untrusted cacert used when testing 2006-05-03 14:10:22 +02:00
msvensson@neptunus.(none)
e1b41812b7 Load CA certs before setting local certs. 
Make it possible to get the yaSSL error message printed in the DBUG log file.
 2006-05-03 14:09:08 +02:00
msvensson@neptunus.(none)
99475e7f4c Add tests for connecting to server with invalid and blank certs. 2006-05-03 14:06:34 +02:00
msvensson@neptunus.(none)
5563a2f32f Add support for specifyihng the number of reconnec retries oin the command line 2006-05-03 14:04:54 +02:00
holyfoot@mysql.com
f66bcd2535 Merge mysql.com:/home/hf/work/mysql-5.0.18455 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-03 16:48:15 +05:00
holyfoot@mysql.com
86cab8533f merging 2006-05-03 16:47:05 +05:00
holyfoot@mysql.com
7ee205f67a merging 2006-05-03 16:42:39 +05:00
svoj@april.(none)
365e38b05c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
 2006-05-03 16:37:42 +05:00
svoj@april.(none)
23d304b312 Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
 2006-05-03 16:36:00 +05:00
holyfoot@mysql.com
9de68b8122 merging 2006-05-03 16:33:42 +05: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
jani@a193-229-222-105.elisa-laajakaista.fi
9b472ef26a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2006-05-03 14:10:33 +03:00
msvensson@shellback.(none)
e2854b8a7f Update yaSSL to version 1.3.0 2006-05-03 13:08:24 +02:00
holyfoot@mysql.com
8667344572 Merge hf@192.168.21.28:work/mysql-4.1.16892 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:53:36 +05:00
holyfoot@mysql.com
486693e219 Merge mysql.com:/home/hf/work/mysql-4.1.15442 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:52:07 +05:00
holyfoot@mysql.com
0007484c26 Merge mysql.com:/home/hf/work/mysql-4.1.15225 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:51:19 +05:00
msvensson@neptunus.(none)
7d9efcc206 Make cert's in std_data that we cpoy from SSL/ depend on the cert's in SSL/ 2006-05-03 12:05:04 +02:00
msvensson@neptunus.(none)
0903ca8bfa Merge 192.168.0.20:mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-05-03 11:59:43 +02:00
msvensson@shellback.(none)
ff7be64f9b Remove client-req-pem and server-req.pem 2006-05-03 11:53:16 +02:00
msvensson@shellback.(none)
0d49a17801 Update NOTES with information how we generate new keys 2006-05-03 11:50:45 +02:00
msvensson@shellback.(none)
21bf41fab0 Generate new ca, client and server cert. 
Set CN in the server cert to localhost so that we can test --ssl-verify-server-cert
 2006-05-03 11:31:23 +02:00
mikael@zim.(none)
fdb8043efe Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/mikael/bug19313
 2006-05-03 01:04:14 -07:00