summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no...cmiller@zippy.cornsilk.net2006-08-311-2/+3
|\
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no...cmiller@zippy.cornsilk.net2006-08-311-2/+3
| |\
| | * Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a cmiller@zippy.cornsilk.net2006-08-311-2/+3
* | | Correcting bad merge.cmiller@zippy.cornsilk.net2006-08-291-4/+4
* | | Post merge changes.iggy@rolltop.ignatz42.dyndns.org2006-08-282-6/+6
* | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527iggy@rolltop.ignatz42.dyndns.org2006-08-286-65/+138
|\ \ \ | |/ /
| * | Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the information_sche...iggy@rolltop.ignatz42.dyndns.org2006-08-283-52/+122
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_m...cmiller@zippy.cornsilk.net2006-08-253-6/+9
| |\ \
| | * | Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \cmiller@zippy.cornsilk.net2006-08-253-6/+9
* | | | Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-2856-332/+400
|\ \ \ \
| * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1tnurnberg@salvation.intern.azundris.com2006-08-2888-643/+2602
| |\ \ \ \
| | * \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1brian@zim.(none)2006-08-2556-332/+400
| | |\ \ \ \
| | | * \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-archbrian@zim.(none)2006-08-257-20/+33
| | | |\ \ \ \
| | | | * | | | Cleanup of unused variables.brian@zim.(none)2006-08-257-20/+33
| | | * | | | | no longer need ifdef as plugin is conditionally compiledacurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-251-2/+0
| | | * | | | | fix for windows buildacurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-246-3/+13
| | | |/ / / /
| | | * | | | This is a cleanup of warnings that windows is complaining about. brian@zim.(none)2006-08-237-10/+6
| | | * | | | This patch removes need for a innodb to have its own configure. brian@zim.(none)2006-08-237-165/+80
| | | * | | | This changest:brian@zim.(none)2006-08-227-35/+31
| | | * | | | This changeset moves the ha_myisam files to their storage directories. It al...brian@zim.(none)2006-08-1916-21/+76
| | | * | | | Update to push all of merge into the merge storage directory.brian@zim.(none)2006-08-1910-19/+35
| | | * | | | Moved heap into its own directory.brian@zim.(none)2006-08-197-13/+31
| | | * | | | Major changes are plug.in files created for almost all storage engines. A few...brian@zim.(none)2006-08-1822-61/+109
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-08-2435-346/+2202
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimepetr/cps@owlet.local2006-08-249-43/+1804
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeandrey@example.com2006-08-239-43/+1804
| | |\ \ \ \ \ \
| | | * | | | | | Fix for bug #20665 All commands supported in Stored Proceduresandrey@example.com2006-08-239-43/+1804
| * | | | | | | | after merge fixpetr/cps@mysql.com/owlet.local2006-08-242-5/+6
| * | | | | | | | Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virginpetr/cps@owlet.local2006-08-232-0/+34
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1petr/cps@owlet.local2006-08-2323-264/+359
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fix for bug#19403/12212 "Crash that happens during removing of database namedlenev@mockturtle.local2006-08-215-54/+95
| | * | | | | | | | Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21216-2dlenev@mockturtle.local2006-08-212-0/+54
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causesdlenev@mockturtle.local2006-08-213-2/+59
| | * | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeandrey@example.com2006-08-1714-160/+160
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Cleanup patch.andrey@example.com2006-08-1714-160/+160
| | * | | | | | | | | Fix for BUG#21247: im_instance_conf.imtest fails on trees with test-1anozdrin/alik@alik.2006-08-152-51/+51
* | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-mainttnurnberg@salvation.intern.azundris.com2006-08-2413-21/+72
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972iggy@rolltop.ignatz42.dyndns.org2006-08-2413-21/+72
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maintiggy@rolltop.ignatz42.dyndns.org2006-08-243-9/+12
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug #11972: client uses wrong character set after reconnect.iggy@rolltop.ignatz42.dyndns.org2006-08-243-9/+12
| | * | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug21749/my50-bug21749msvensson@neptunus.(none)2006-08-242-13/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0-maintmsvensson@neptunus.(none)2006-08-2421-34/+255
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-08-241-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith@maint1.mysql.com2006-08-242-4/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gcacmiller@zippy.cornsilk.net2006-08-232-4/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50tsmith/tim@siva.hindu.god2006-08-232-2/+15
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50tsmith/tim@siva.hindu.god2006-08-231-2/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50tsmith/tim@siva.hindu.god2006-08-234-9/+118
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908cmiller@maint1.mysql.com2006-08-231-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@maint1.mysql.com2006-08-234-2/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \