mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
45270 commits 2781 branches 343 tags 1.6 GiB
Commit graph

45270 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.blaudden
61a3fdd782 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 22:12:32 +02:00
msvensson@pilot.blaudden
05c0e928a9 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-11 22:08:19 +02:00
msvensson@pilot.blaudden
4774c40089 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 22:08:00 +02:00
msvensson@pilot.blaudden
941c411dd0 Bug#21765 Illegal Instruction crash on pre-pentium when using YASSL 
- Import patch with different method of detecting if machine has
   cpuid instruction
 2007-04-11 22:07:24 +02:00
msvensson@pilot.blaudden
d631f11972 Print warning to log when SSL setup fails 2007-04-11 21:38:43 +02:00
msvensson@pilot.blaudden
900e0d685d Merge pilot.blaudden:/home/msvensson/mysql/bug21611/my50-bug21611 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-11 21:03:29 +02:00
msvensson@pilot.blaudden
e81cb86952 Add test for connect using different ssl ciphers 2007-04-11 21:01:10 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:34:02 +02:00
msvensson@pilot.blaudden
bbed143483 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:06:56 +02:00
msvensson@pilot.blaudden
4e17e06a5b Add replace_result for things that are not tested 2007-04-11 09:06:27 +02:00
msvensson@pilot.blaudden
8abdae6b6c Merge pilot.blaudden:/home/msvensson/mysql/bug25337/my51-bug25337 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 18:53:36 +02:00
msvensson@pilot.blaudden
6015d28386 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 18:20:27 +02:00
msvensson@pilot.blaudden
610ff38ed9 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 17:33:21 +02:00
msvensson@pilot.blaudden
8d0755ba47 Update result(which mysterioulsy got lost) 2007-04-10 17:33:04 +02:00
msvensson@pilot.blaudden
19f379b807 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 17:17:53 +02:00
msvensson@pilot.blaudden
3d847358de Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 17:17:08 +02:00
msvensson@pilot.blaudden
9917d018a6 Take into account wether vertical_results are in effect 2007-04-10 17:09:35 +02:00
msvensson@pilot.blaudden
73c6cde9d4 Init dying to 1 just after passing the guard 2007-04-10 17:06:36 +02:00
msvensson@pilot.blaudden
da2a216895 Add OPT_LOG_DIR 2007-04-10 17:05:22 +02:00
msvensson@pilot.blaudden
a5ef5c93c3 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 15:06:25 +02:00
msvensson@pilot.blaudden
c30b68805c Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 15:03:22 +02:00
msvensson@pilot.blaudden
1834530549 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 15:03:14 +02:00
msvensson@pilot.blaudden
448a6778cb Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:59:46 +02:00
msvensson@pilot.blaudden
d549e4803a Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:59:16 +02:00
msvensson@pilot.blaudden
f194cbe62a Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-04-10 14:58:55 +02:00
msvensson@pilot.blaudden
d4f01284bd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:47:53 +02:00
msvensson@pilot.blaudden
829ca34daf Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:46:57 +02:00
msvensson@pilot.blaudden
5c5271754b Add --logdir option ot mysqltest 2007-04-10 14:45:13 +02:00
msvensson@pilot.blaudden
4496a8f546 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 14:31:33 +02:00
msvensson@pilot.blaudden
34a784f3d0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 14:29:22 +02:00
msvensson@pilot.blaudden
60eb839e77 Merge 192.168.0.4:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-04-10 13:51:32 +02:00
msvensson@pilot.blaudden
d08e35291e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 12:19:42 +02:00
msvensson@pilot.blaudden
9f11d74cb0 Give the "sync_slave_with_master" something to do 2007-04-10 12:19:00 +02:00
msvensson@pilot.blaudden
6068275521 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-10 12:15:47 +02:00
msvensson@pilot.blaudden
7cf3a2a6a5 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-04-10 12:13:47 +02:00
holyfoot/hf@hfmain.(none)
26d2908c70 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-09 11:46:58 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
bd461b01f0 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-09 11:45:14 +05:00
holyfoot/hf@hfmain.(none)
87daef26a6 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-09 11:16:05 +05:00
holyfoot/hf@hfmain.(none)
33ed2ead2a Merge bk@192.168.21.1:mysql-5.1 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-09 11:07:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
65535824ba Merge bk@192.168.21.1:mysql-5.0 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-09 11:06:28 +05:00
kent@kent-amd64.(none)
a16289d550 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
 2007-04-08 20:48:07 +02:00
kent@mysql.com/kent-amd64.(none)
c282dd3715 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
 2007-04-08 20:46:40 +02:00
evgen@moonbone.local
d8e6b38ec1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
 2007-04-07 23:09:09 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
171f8badd7 merging fix 2007-04-08 00:05:34 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
7ceefd2b3f after-merging fix 2007-04-07 23:16:03 +05:00
holyfoot/hf@hfmain.(none)
6ffa4b9c84 Merge mysql.com:/home/hf/work/26074/my51-26074 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 16:36:50 +05:00
holyfoot/hf@hfmain.(none)
fa153792ab Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 15:01:24 +05:00
holyfoot/hf@hfmain.(none)
ce426dd622 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
 2007-04-07 14:59:53 +05:00
tomas@whalegate.ndb.mysql.com
e782e5d52b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
 2007-04-07 09:18:43 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
1bc1eecd42 Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt 
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
 2007-04-07 11:37:09 +05:00