summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-11-0214-147/+228
|\
| * Bug#22828 complementary patch:thek@kpdesk.mysql.com2006-11-021-1/+1
| * Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maintthek@kpdesk.mysql.com2006-11-024-20/+153
| |\
| | * Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maintthek@kpdesk.mysql.com2006-11-014-20/+153
| | |\
| | | * Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828thek@kpdesk.mysql.com2006-11-014-20/+153
| | | |\
| | | | * Bug#22828 _my_b_read() ignores return values for my_seek() callsthek@kpdesk.mysql.com2006-10-314-20/+153
| | | * | Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/41tsmith/tim@siva.hindu.god2006-10-167-22/+64
| | | |\ \
| | * | \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-10-241-82/+500
| | |\ \ \ \
| | | * \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-10-111-82/+500
| | | |\ \ \ \
| | * | \ \ \ \ Merge naruto.:C:/cpp/bug23010/my50-bug23010Kristofer.Pettersson@naruto.2006-10-172-3/+12
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/50tsmith/tim@siva.hindu.god2006-10-167-22/+64
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0msvensson@shellback.(none)2006-10-031-29/+19
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-10-2312-127/+75
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1cmiller@zippy.cornsilk.net2006-10-1712-127/+75
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge naruto.:C:/cpp/bug23010/my51-bug23010Kristofer.Pettersson@naruto.2006-10-172-3/+12
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge naruto.:C:/cpp/bug23010/my50-bug23010Kristofer.Pettersson@naruto.2006-10-172-3/+12
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Bug#23010 _my_b_read() passing illegal file handles to my_seek()Kristofer.Pettersson@naruto.2006-10-092-3/+12
| | | * | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51tsmith/tim@siva.hindu.god2006-10-1610-124/+63
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Remove unused (and incorrect) my_lread() and my_lwrite()tsmith/tim@siva.hindu.god2006-09-145-106/+3
| | | | * | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/50tsmith/tim@siva.hindu.god2006-09-147-22/+64
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | / / / / / | | | | | | |_|_|/ / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41tsmith/tim@siva.hindu.god2006-09-147-22/+64
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | / / | | | | | | | |_|_|_|/ / | | | | | | |/| | | | |
| | | | | | * | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40tsmith/tim@siva.hindu.god2006-09-146-14/+56
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event'...tsmith/tim@siva.hindu.god2006-09-146-14/+56
| | | | | | * | | | | | | Bug #4053: too many of "error 1236: 'binlog truncated in the middle of event'...tsmith/tim@siva.hindu.god2006-09-141-6/+9
| | | | | | | |_|_|_|_|/ | | | | | | |/| | | | |
* | | | | | | | | | | | Merge trift2.:/MySQL/M51/clone-5.1joerg@trift2.2006-11-012-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | thr_alarm.c, thr_lock.c, my_global.h:kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-10-122-3/+2
| |/ / / / / / / / / /
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2006-10-191-82/+500
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug8283istruewing@chilla.local2006-10-091-82/+500
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug8283-oneistruewing@chilla.local2006-10-091-82/+500
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | * | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug8283istruewing@chilla.local2006-10-091-82/+500
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | Bug#8283 - OPTIMIZE TABLE causes data lossistruewing@chilla.local2006-10-091-82/+500
| | | * | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1svoj@mysql.com/april.(none)2006-10-021-1/+3
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@mysql.com/april.(none)2006-10-021-1/+3
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-10-102-18/+95
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix to make it build on all platforms.mats@romeo.(none)2006-10-101-1/+2
| * | | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rplmats@romeo.(none)2006-10-062-18/+94
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-061-1/+1
| | * | | | | | | | | | | BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-021-0/+47
| | * | | | | | | | | | | BUG#19459 (BINLOG RBR command does not lock tables correctly causingmats@romeo.(none)2006-10-021-18/+47
* | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |