Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bk@192.168.21.1:mysql-5.1 | holyfoot/hf@hfmain.(none) | 2007-03-22 | 1 | -1/+1 |
|\ | |||||
| * | Merge bk@192.168.21.1:mysql-5.1 | holyfoot/hf@hfmain.(none) | 2007-03-22 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt | holyfoot/hf@hfmain.(none) | 2007-03-22 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug#23345: Wrongly allowed INTO in a non-last select of a UNION. | evgen@moonbone.local | 2007-03-21 | 1 | -1/+1 |
| | | * | Merge bk-internal:/home/bk/mysql-5.0-opt | gkodinov/kgeorge@magare.gmz | 2007-03-09 | 1 | -4/+13 |
| | | |\ | |||||
| | | | * | WL#3527: Extend IGNORE INDEX so places where index is ignored can | gkodinov/kgeorge@macbook.gmz | 2007-03-09 | 1 | -4/+13 |
* | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 | tsmith@quadxeon.mysql.com | 2007-03-22 | 1 | -56/+38 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | kostja@bodhi.local | 2007-03-20 | 1 | -56/+38 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime | malff/marcsql@weblab.(none) | 2007-03-14 | 1 | -27/+16 |
| | |\ \ \ | |||||
| | | * | | | Bug#26503 (Illegal SQL exception handler code causes the server to crash) | malff/marcsql@weblab.(none) | 2007-03-14 | 1 | -27/+16 |
| | | |/ / | |||||
| | * | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1 | kroki/tomash@moonlight.home | 2007-03-09 | 1 | -21/+21 |
| | |\ \ \ | |||||
| | | * | | | Resolve one shift/reduce conflict introduced with the push of the fix | kroki/tomash@moonlight.home | 2007-03-09 | 1 | -21/+21 |
| | * | | | | Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1 | kroki/tomash@moonlight.home | 2007-03-09 | 1 | -8/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | BUG#9953: CONVERT_TZ requires mysql.time_zone_name to be locked | kroki/tomash@moonlight.home | 2007-03-09 | 1 | -8/+1 |
* | | | | | | BUG#27270 Can't compile latest 5.1-main | df@pippilotta.erinye.com | 2007-03-19 | 1 | -3/+3 |
|/ / / / / | |||||
* | | | | | WL3527: post-merge updates | gkodinov/kgeorge@magare.gmz | 2007-03-11 | 1 | -1/+1 |
* | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt | gkodinov/kgeorge@magare.gmz | 2007-03-09 | 1 | -78/+80 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | WL#3527: Extend IGNORE INDEX so places where index is ignored | gkodinov/kgeorge@macbook.gmz | 2007-03-05 | 1 | -78/+80 |
* | | | | | A post merge fix. | kostja@bodhi.local | 2007-03-07 | 1 | -16/+16 |
* | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-26750 | kostja@bodhi.local | 2007-03-07 | 1 | -386/+453 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | A fix for Bug#26750 "valgrind leak in sp_head" (and post-review | kostja@bodhi.local | 2007-03-07 | 1 | -327/+394 |
* | | | | | Post-merge fixes. | kostja@bodhi.local | 2007-03-06 | 1 | -2/+2 |
* | | | | | Merge bodhi.local:/opt/local/work/mysql-5.0-runtime | kostja@bodhi.local | 2007-03-06 | 1 | -19/+24 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Freeze the number of conflicts. We should not introduce any more | kostja@bodhi.local | 2007-03-02 | 1 | -0/+5 |
| * | | | | Rename a macro to better reflect the action taken. | kostja@bodhi.local | 2007-03-02 | 1 | -19/+19 |
| * | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base | malff/marcsql@weblab.(none) | 2007-03-01 | 1 | -33/+110 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base | malff/marcsql@weblab.(none) | 2007-02-16 | 1 | -33/+110 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug#24532 (The return data type of IS TRUE is different from similar | malff/marcsql@weblab.(none) | 2007-02-12 | 1 | -16/+12 |
| | | * | | | | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime | malff/marcsql@weblab.(none) | 2007-01-30 | 1 | -17/+98 |
| | | |\ \ \ \ | |||||
| * | | \ \ \ \ | Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl | rafal@quant.(none) | 2007-03-01 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fixes of compilation warnings and errors. | rafal@quant.(none) | 2007-03-01 | 1 | -0/+1 |
| * | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl | lars/lthalmann@mysql.com/dl145k.mysql.com | 2007-02-28 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge mysql.com:/home/gluh/MySQL/Merge/5.0 | gluh@mysql.com/eagle.(none) | 2007-02-26 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl | kostja@bodhi.local | 2007-03-06 | 1 | -0/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/bar/mysql-5.0.merge | bar@mysql.com | 2007-03-01 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl | bar@mysql.com | 2007-02-28 | 1 | -0/+7 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | Bug#15126 character_set_database is not replicated (LOAD DATA INFILE need it) | bar@mysql.com | 2007-02-28 | 1 | -0/+7 |
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com/narttu.mysql.fi | 2007-02-21 | 1 | -6/+1 |
| | |\ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base | malff/marcsql@weblab.(none) | 2007-02-28 | 1 | -11/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1 | gluh@eagle.(none) | 2007-02-26 | 1 | -1/+12 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt | gluh@eagle.(none) | 2007-02-26 | 1 | -1/+12 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | item.cc: | evgen@moonbone.local | 2007-02-24 | 1 | -0/+6 |
| | | * | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt | gkodinov/kgeorge@rakia.gmz | 2007-02-19 | 1 | -1/+6 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving. | gkodinov/kgeorge@macbook.gmz | 2007-02-19 | 1 | -1/+6 |
| | | | | |_|/ / / / / | | | | |/| | | | | | | |||||
| * | | | | | | | | | | Fixed compilations problems and warnings on windows | monty@mysql.com/narttu.mysql.fi | 2007-02-23 | 1 | -10/+10 |
| * | | | | | | | | | | Merge ppcg5.local:/Users/antony/Work/p3-bug12204.4 | antony@ppcg5.local | 2007-02-08 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Bug#12204 | antony@ppcg5.local | 2007-02-07 | 1 | -0/+1 |
| | |/ / / / / / / | |||||
* | | | | | | | | | Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base | malff/marcsql@weblab.(none) | 2007-02-15 | 1 | -44/+40 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | jani@a88-113-38-195.elisa-laajakaista.fi | 2007-02-03 | 1 | -38/+30 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | monty@narttu.mysql.fi | 2007-01-29 | 1 | -38/+30 |
| | |\ \ \ \ \ \ \ \ |