mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37925 commits 2790 branches 343 tags 1.7 GiB
Commit graph

37925 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@april.(none)
36be4318da Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 20:43:36 +05:00
mleich@three.local.lan
5f5d1507ec 1. Cumulated fix for Bug#22398, #22404 and #22405 
2. Correct some logical bugs within the tests, which were caused by
   automatic resolve of BitKeeper
 2006-09-18 16:55:56 +02:00
svoj@april.(none)
419a51c5a5 Merge april.(none):/home/svoj/devel/bk/mysql-5.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
 2006-09-18 19:43:33 +05:00
istruewing@chilla.local
33acddb568 Merge 5.1 -> 5.1-engines 
Disabled im_instance_conf to get autopush through
 2006-09-16 20:32:01 +02:00
baker@bk-internal.mysql.com
343e08391d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-09-16 07:19:42 +02:00
cmiller@zippy.cornsilk.net
dc8449886f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 18:19:09 -04:00
cmiller@zippy.cornsilk.net
66808ead4e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 18:18:18 -04:00
istruewing@chilla.local
06b721f104 Merge 5.1 -> 5.1-engines 
Disabled innodb_mysql to get autopush through
 2006-09-15 21:42:49 +02:00
istruewing@chilla.local
e88cd60fd3 Merge 5.1 -> 5.1-engines 
Disabled index_merge_myisam to get autopush through
 2006-09-15 20:32:09 +02:00
brian@zim.(none)
f79ddec1f2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-15 10:48:30 -07:00
istruewing@chilla.local
92e5f116cb Merge 5.1 -> 5.1-engines 
Disabled index_merge_innodb to get autopush through
 2006-09-15 19:31:42 +02:00
brian@zim.(none)
7194b6d75a This changes the order of the universe, black is now the new white. 
In practice this means that handlerton is now created by the server and is passed to the engine. Plugin startups can now also control how plugins are inited (and can optionally pass values). Bit more flexibility to those who want to write plugin interfaces to the database.
 2006-09-15 10:28:00 -07:00
msvensson@shellback.(none)
d8e27606e1 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 18:00:03 +02:00
msvensson@shellback.(none)
6a0841a1bc Add definition of SHUT_RDWR for compiling on windows 2006-09-15 17:53:45 +02:00
cmiller@zippy.cornsilk.net
895bf0555b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-15 11:25:02 -04:00
istruewing@chilla.local
c62c1a54fa Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-toteam
 2006-09-15 17:21:38 +02:00
istruewing@chilla.local
525ff08213 Merge 5.1 -> 5.1-engines 
Disabled im_daemon_life_cycle with permission by Calvin
 2006-09-15 17:17:56 +02:00
msvensson@shellback.(none)
b0fc6840b4 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 17:09:58 +02:00
msvensson@shellback.(none)
8f7eac7a35 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 17:01:28 +02:00
msvensson@shellback.(none)
27d8545868 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 17:00:29 +02:00
msvensson@shellback.(none)
f1e91ec7f7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 17:00:09 +02:00
msvensson@shellback.(none)
b178e40cae Merge shellback.(none):/home/msvensson/mysql/bug20602/my50-bug20602 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:57:37 +02:00
msvensson@shellback.(none)
bfc3cfd4ee Merge msvensson.mysql.internal:mysql/my50-m-bug16574 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:55:47 +02:00
msvensson@shellback.(none)
cda04e76f5 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 16:53:21 +02:00
msvensson@shellback.(none)
557a8f50b8 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:52:52 +02:00
msvensson@shellback.(none)
fb89352b47 Merge msvensson.mysql.internal:mysql/my50-m-bug16576 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:52:08 +02:00
msvensson@shellback.(none)
e9dab2149d Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 16:51:30 +02:00
msvensson@shellback.(none)
59c80b4165 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 16:50:25 +02:00
msvensson@shellback.(none)
223c82fde2 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:50:08 +02:00
msvensson@shellback.(none)
a297c29243 Merge msvensson.mysql.internal:mysql/my50-m-bug21222 
into  shellback.(none):/home/msvensson/mysql/work/my50-work
 2006-09-15 16:49:24 +02:00
msvensson@shellback.(none)
ec7b20c32f Merge shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 16:46:57 +02:00
msvensson@shellback.(none)
2c3015499d Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:42:27 +02:00
msvensson@shellback.(none)
211aceca68 Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139
 2006-09-15 16:41:50 +02:00
hartmut@mysql.com/linux.site
4e65deb2fa Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/hartmut/projects/mysql/dev/teamtrees/mysql-5.0-maint
 2006-09-15 16:38:18 +02:00
hartmut@mysql.com/linux.site
871eeadc94 Add SSL specific linker flags to --libmysqld-libs (Bug #21239) 2006-09-15 16:35:50 +02:00
msvensson@shellback.(none)
a265bb9b1f Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 15:46:02 +02:00
msvensson@shellback.(none)
e03619ce63 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 15:45:03 +02:00
msvensson@shellback.(none)
2ce0da628e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 15:43:46 +02:00
msvensson@shellback.(none)
faeb59cbbf Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 15:41:50 +02:00
msvensson@shellback.(none)
c3e2d543db Bug#22326 Build problems on hurd-i386: conflicting declaration of socklen_t 2006-09-15 15:41:04 +02:00
cmiller@zippy.cornsilk.net
47483245b9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-15 09:00:46 -04:00
msvensson@shellback.(none)
d4cb04fc05 Merge shellback.(none):/home/msvensson/mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 14:39:55 +02:00
msvensson@shellback.(none)
9fc503e099 Merge msvensson.mysql.internal:mysql/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-09-15 14:36:03 +02:00
msvensson@shellback.(none)
bdc7837388 Merge msvensson.mysql.internal:mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 14:34:50 +02:00
msvensson@shellback.(none)
cebd7d9d67 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 14:31:25 +02:00
msvensson@shellback.(none)
2b79a6bc36 Merge shellback.(none):/home/msvensson/mysql/work/my50-work 
into  shellback.(none):/home/msvensson/mysql/work/my51-work
 2006-09-15 14:28:25 +02:00
msvensson@shellback.(none)
c4177ec484 Use the enum/define SHUT_RDWR instead of heardcoded "2" to shutdown 2006-09-15 14:27:45 +02:00
ramil/ram@myoffice.izhnet.ru
8445f3e3de Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-09-15 14:15:09 +05:00
msvensson@shellback.(none)
a989d35221 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 11:03:55 +02:00
dlenev@mockturtle.local
1022179878 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-15 09:19:35 +04:00