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
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
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
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
tsmith/tim@siva.hindu.god
ee6275c503
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-09-14 18:57:36 -06:00
ted@ted.mysql.internal
5610ef3018
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-maint
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
2006-09-15 04:32:58 +04:00
ted@ted.mysql.internal
a1e9531d29
Merge ted.mysql.internal:/home/ted/src/mysql/mysql-5.0-5.1-gca
...
into ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
2006-09-15 04:14:46 +04:00
ted@ted.mysql.internal
cb08c534a0
Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option
2006-09-15 04:01:47 +04:00
andrey@example.com
fcb79e1bfd
Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't
...
initialized prior to usage as well as deinitialized on shutdown.
2006-09-14 23:25:59 +02:00
tsmith/tim@siva.hindu.god
2c67b7cecd
Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory leak.
2006-09-14 14:59:14 -06:00
iggy@rolltop.ignatz42.dyndns.org
02833f49c3
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-09-14 16:37:22 -04:00
dlenev@mockturtle.local
5ba1b83c98
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
2006-09-14 23:53:35 +04:00
iggy@rolltop.ignatz42.dyndns.org
453c5c5aa8
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my50-bug21424
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424
2006-09-14 14:57:11 -04:00
