summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-10-031-2/+2
|\
| * Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-09-291-1/+3
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-09-291-1/+3
| | |\
| * | \ Merge rama.(none):/home/jimw/my/mysql-5.0-cleanjimw@rama.(none)2006-09-281-2/+2
| |\ \ \ | | |/ /
| | * | Bug #18246: compilation error with tcp_wrapperjimw@rama.(none)2006-09-111-2/+2
* | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1svoj@april.(none)2006-10-021-29/+19
|\ \ \ \
| * \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-enginessvoj@april.(none)2006-09-291-29/+19
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-09-291-29/+19
| | |\ \ \ | | | |/ / | | |/| |
| | | * | BUG#21617 - crash when selecting from merge table with inconsistent indexessvoj@mysql.com/april.(none)2006-09-281-29/+19
* | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-optgkodinov/kgeorge@macbook.gmz2006-09-271-1/+3
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge mysql.com:/home/hf/work/mysql-4.1.15428holyfoot/hf@mysql.com/deer.(none)2006-09-251-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)holyfoot/hf@mysql.com/deer.(none)2006-09-041-1/+3
| | |/
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053cmiller@zippy.cornsilk.net2006-08-311-22/+25
| | |\
| * | \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0grichter@bk-internal.mysql.com2006-09-021-22/+25
| |\ \ \
| * | | | Fixes for crashes and test failuresgeorg@lmy002.wdf.sap.corp2006-09-011-1/+2
| * | | | make dist changes for Cmake buildgeorg@lmy002.wdf.sap.corp2006-09-011-1/+2
| * | | | Additional files for cmake supportgeorg@lmy002.wdf.sap.corp2006-08-311-0/+29
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053cmiller@zippy.cornsilk.net2006-08-301-22/+25
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053cmiller@zippy.cornsilk.net2006-08-301-22/+25
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053cmiller@zippy.cornsilk.net2006-08-301-22/+25
| | |\ \
| | | * | Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \cmiller@zippy.cornsilk.net2006-08-301-22/+25
| | | * | Bug#12920 - key_read_requests counter appears to re-setingo@mysql.com2005-09-141-5/+7
* | | | | Merge zim.(none):/home/brian/mysql/dep-5.1brian@zim.(none)2006-08-142-3/+3
|\ \ \ \ \
| * | | | | Removed warnings for Windows build issues. Edited Windows README to remove re...brian@zim.(none)2006-08-142-3/+3
* | | | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergekroki/tomash@moonlight.intranet2006-08-101-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Bug #21396: Wrong error number generated for a missing tablegeorg@lmy002.wdf.sap.corp2006-08-021-2/+2
| * | | | Fix after manual merge.kroki/tomash@moonlight.intranet2006-07-291-1/+1
| * | | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergekroki/tomash@moonlight.intranet2006-07-291-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | BUG#21206: memory corruption when too many cursors are opened at oncekroki/tomash@moonlight.intranet2006-07-261-1/+1
| | |/ /
* | | | serg's MacOSX-intel portability diffgkodinov/kgeorge@macbook.gmz2006-08-011-0/+1
|\ \ \ \
| * | | | support for xadd emulation, workaround for Darwinserg@serg.mylan2006-06-291-0/+1
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1tsmith/tim@siva.hindu.god2006-07-152-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-131-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2006-06-301-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fixed include file usagemonty@mysql.com2006-06-301-0/+1
| | * | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0lars@mysql.com2006-06-291-0/+51
| | |\ \ \ \
| | * \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0gluh@mysql.com2006-06-281-1/+23
| | |\ \ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0rburnett@bk-internal.mysql.com2006-06-261-1/+23
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.1-new-rplmkindahl@dl145k.mysql.com2006-07-111-2/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixing the prototype for my_strndup() to compile on Windows.mats@romeo.(none)2006-07-071-1/+1
| | * | | | | | | | Correcting signature for my_strndup to be able to build on Windowsmats@romeo.(none)2006-07-071-1/+1
* | | | | | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1cmiller@zippy.(none)2006-07-103-4/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge bodhi.netgear:/opt/local/work/tmp_mergekonstantin@bodhi.netgear2006-07-062-4/+3
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Fix compilation failures on Windows caused by the patch for Bug#17199.konstantin@mysql.com2006-06-272-2/+2
| * | | | | | | | | Merge mysql.com:/home/mydev/mysql-5.0-tmp_mergeingo@mysql.com2006-07-041-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0ingo@mysql.com2006-06-261-1/+3
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge mysql.com:/home/alik/MySQL/devel/5.0-treeanozdrin@mysql.com2006-06-261-1/+3
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-bug20622knielsen@mysql.com2006-06-231-1/+3
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | * | | | | | | | | | Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0ingo@mysql.com2006-06-261-0/+2
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Bug#16986 - Deadlock condition with MyISAM tablesingo@mysql.com2006-06-261-0/+2
| | | |/ / / / / / / /