Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | manual merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-06-06 | 1 | -4/+0 |
|\ | |||||
| * | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-07 | 1 | -4/+0 |
| |\ | |||||
| | * | Bug#50755: Crash if stored routine def contains version comments | Davi Arnaut | 2010-04-01 | 1 | -4/+0 |
* | | | Pre-requisite patch for bug #51263 "Deadlock between | Dmitry Lenev | 2010-05-25 | 1 | -1/+3 |
|/ / | |||||
* | | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -0/+1 |
* | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+8 |
* | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -5/+14 |
|\ \ | |||||
| * \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-21 | 1 | -8/+16 |
| |\ \ | |||||
| | * \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -8/+16 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-22 | 1 | -8/+14 |
| | | * | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -0/+2 |
* | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | backported: | Sergey Glukhov | 2010-01-15 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -1/+1 |
| |/ | |||||
* | | Apply and review: | Konstantin Osipov | 2009-12-29 | 1 | -3/+27 |
* | | Backport of: | Konstantin Osipov | 2009-12-09 | 1 | -25/+4 |
* | | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -4/+4 |
|/ | |||||
* | merging | Alexey Botchkov | 2009-04-29 | 1 | -4/+4 |
|\ | |||||
| * | Bug#25058 ignored return codes in memory allocation functions | Alexey Botchkov | 2008-11-21 | 1 | -4/+4 |
* | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Bug#26030 (Parsing fails for stored routine w/multi-statement execution | Marc Alff | 2008-07-07 | 1 | -1/+0 |
* | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570 | cmiller@zippy.cornsilk.net | 2008-05-15 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \ | cmiller@zippy.cornsilk.net | 2008-05-15 | 1 | -0/+1 |
* | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51 | tsmith@ramayana.hindu.god | 2008-01-25 | 1 | -2/+3 |
|\ \ | |||||
| * \ | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 | malff@lambda.hsd1.co.comcast.net. | 2008-01-23 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | Bug#33618 (Crash in sp_rcontext) | malff@lambda.hsd1.co.comcast.net. | 2008-01-23 | 1 | -2/+3 |
| | * | Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 | thek@adventure.(none) | 2007-11-21 | 1 | -3/+3 |
| | |\ | |||||
* | | \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | cmiller@zippy.cornsilk.net | 2007-12-14 | 1 | -103/+114 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Doxygenize comments. | cmiller@zippy.cornsilk.net | 2007-10-16 | 1 | -103/+114 |
* | | | | Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 | thek@adventure.(none) | 2007-11-21 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 | thek@adventure.(none) | 2007-11-21 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | Bug #31153 calling stored procedure crashes server if available memory is low | thek@adventure.(none) | 2007-11-19 | 1 | -3/+3 |
* | | | | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime | malff@lambda.hsd1.co.comcast.net. | 2007-10-16 | 1 | -10/+1 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Bug#28318 CREATE FUNCTION (UDF) requires a schema | davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br | 2007-10-09 | 1 | -10/+1 |
| |/ | |||||
* | | Provide initial module structure to Doxygen. | kostja@bodhi.(none) | 2007-08-15 | 1 | -0/+9 |
* | | Fix doxygen warnings. | kostja@bodhi.(none) | 2007-08-15 | 1 | -1/+1 |
* | | Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime | kostja@bodhi.(none) | 2007-07-16 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | A fix and a test case for Bug#26141 mixing table types in trigger | kostja@bodhi.(none) | 2007-07-12 | 1 | -0/+6 |
* | | Patch for the following bugs: | anozdrin/alik@ibm. | 2007-06-28 | 1 | -4/+74 |
* | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 | lars/lthalmann@dl145k.mysql.com | 2007-06-21 | 1 | -4/+11 |
|\ \ | |||||
| * | | Part of patch for BUG#11986: make sp_head::m_body_begin pointer | anozdrin/alik@ibm. | 2007-06-14 | 1 | -0/+5 |
| * | | This the 4-th patch in scope of CS patch (BUG#11986). | anozdrin/alik@ibm. | 2007-06-14 | 1 | -2/+4 |
| * | | Follow up after work on Bug 4968 | kostja@bodhi.(none) | 2007-06-10 | 1 | -2/+2 |
* | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl | lars/lthalmann@dl145h.mysql.com | 2007-06-05 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | kostja@bodhi.(none) | 2007-06-01 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | jani@a88-113-38-195.elisa-laajakaista.fi | 2007-05-24 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | WL#3817: Simplify string / memory area types and make things more consistent ... | monty@mysql.com/narttu.mysql.fi | 2007-05-10 | 1 | -2/+2 |
* | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl | mats@kindahl-laptop.dnsalias.net | 2007-05-31 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | WL#3339 (Issue warnings when statement-based replication may fail): | mats@romeo.kindahl.net | 2007-05-14 | 1 | -1/+1 |
| | |/ / | |/| | |