Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | WL#3817: Simplify string / memory area types and make things more consistent ... | monty@mysql.com/narttu.mysql.fi | 2007-05-10 | 1 | -11/+13 |
* | Merge romeo.(none):/home/bkroot/mysql-5.1-rpl | mats@romeo.(none) | 2007-04-20 | 1 | -9/+9 |
|\ | |||||
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | jani@ua141d10.elisa.omakaista.fi | 2007-04-10 | 1 | -9/+9 |
| |\ | |||||
| | * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel | jani@ua141d10.elisa.omakaista.fi | 2007-04-03 | 1 | -9/+9 |
| | |\ | |||||
| | | * | Manual merge from 5.0 | jani@ua141d10.elisa.omakaista.fi | 2007-03-29 | 1 | -3/+3 |
| | | * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel | jani@ua141d10.elisa.omakaista.fi | 2007-03-29 | 1 | -6/+6 |
| | | |\ | |||||
| | | | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel | serg@sergbook.mysql.com | 2007-03-24 | 1 | -9/+9 |
| | | | |\ | |||||
| | | | | * | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() | aelkin/elkin@andrepl.(none) | 2007-03-23 | 1 | -9/+9 |
* | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl | mats@romeo.(none) | 2007-04-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be | mats@romeo.(none) | 2007-04-12 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 | mskold/marty@linux.site | 2007-04-04 | 1 | -2/+44 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge from 5.0 | mskold/marty@mysql.com/linux.site | 2007-04-04 | 1 | -9/+6 |
| * | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 | mskold/marty@linux.site | 2007-04-04 | 1 | -0/+45 |
| |\ \ \ \ | |||||
| | * | | | | Bug #26242 UPDATE with subquery and triggers failing with cluster tables | mskold/marty@mysql.com/linux.site | 2007-04-04 | 1 | -3/+48 |
* | | | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt | evgen@moonbone.local | 2007-03-31 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the | evgen@sunlight.local | 2007-03-30 | 1 | -0/+2 |
* | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/WL3527-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-03-26 | 1 | -4/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fixed bug #27229: crash when a set function aggregated in outer | igor@olga.mysql.com | 2007-03-22 | 1 | -4/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-03-22 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-03-20 | 1 | -2/+4 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Bug #24484: | gkodinov/kgeorge@macbook.local | 2007-03-20 | 1 | -2/+4 |
* | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 | ibabaev@bk-internal.mysql.com | 2007-03-20 | 1 | -14/+15 |
|\ \ \ \ \ | |||||
| * | | | | | sql_insert.cc: | evgen@moonbone.local | 2007-03-20 | 1 | -16/+12 |
| * | | | | | Merge moonbone.local:/mnt/gentoo64/work/27006-bug-5.0-opt-mysql | evgen@moonbone.local | 2007-03-20 | 1 | -0/+5 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | sql_insert.cc: | evgen@moonbone.local | 2007-03-20 | 1 | -5/+5 |
| | * | | | | Bug#27006: AFTER UPDATE triggers not fired with INSERT ... ON DUPLICATE KEY | evgen@moonbone.local | 2007-03-16 | 1 | -6/+6 |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | serg@janus.mylan | 2007-03-17 | 1 | -3/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | wl#3700 - post-review fixes: | serg@janus.mylan | 2007-03-17 | 1 | -1/+1 |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | serg@janus.mylan | 2007-03-16 | 1 | -3/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | serg@janus.mylan | 2007-03-16 | 1 | -3/+1 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | serg@janus.mylan | 2007-03-06 | 1 | -39/+58 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | serg@janus.mylan | 2007-02-26 | 1 | -7/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | serg@janus.mylan | 2007-02-21 | 1 | -3/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | WL#3700: Handler API change: all index search methods - that is, | serg@janus.mylan | 2007-01-29 | 1 | -3/+1 |
* | | | | | | | | | | | sql_insert.cc: | evgen@moonbone.local | 2007-03-16 | 1 | -13/+14 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | merging | holyfoot/hf@mysql.com/hfmain.(none) | 2007-03-16 | 1 | -1/+1 |
* | | | | | | | | | | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-03-16 | 1 | -23/+45 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | / / / / | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-03-16 | 1 | -23/+45 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Bug #26261: | gkodinov/kgeorge@macbook.gmz | 2007-03-16 | 1 | -23/+45 |
| * | | | | | | | | | Bug#27033: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE if rows were | evgen@moonbone.local | 2007-03-15 | 1 | -7/+9 |
| * | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0 | holyfoot/hf@mysql.com/hfmain.(none) | 2007-03-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ | Merge bk@192.168.21.1:mysql-5.1 | holyfoot/hf@hfmain.(none) | 2007-03-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-03-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | / / / / | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | evgen@moonbone.local | 2007-03-02 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Bug#25122: Views based on a self-joined table aren't insertable. | evgen@moonbone.local | 2007-03-02 | 1 | -2/+2 |
| | | | |/ / / / / / / | | | |/| | | | | | | | |||||
* | | | | | | | | | | | Post-merge fix | lars/lthalmann@mysql.com/dl145k.mysql.com | 2007-03-01 | 1 | -1/+1 |
* | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl | lars/lthalmann@dl145k.mysql.com | 2007-03-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl | rafal@quant.(none) | 2007-03-01 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fixes of compilation warnings and errors. | rafal@quant.(none) | 2007-03-01 | 1 | -0/+2 |
| * | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl | lars/lthalmann@mysql.com/dl145k.mysql.com | 2007-02-28 | 1 | -3/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | / / / / / / / / | | |_|/ / / / / / / / | |/| | | | | | | | | |