Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -1/+11 |
|\ | |||||
| * | Merge from mysql-5.1-security to mysql-5.5-security | Jon Olav Hauglid | 2012-01-09 | 1 | -1/+11 |
| |\ | |||||
| | * | Backport from mysql-trunk of: | Jon Olav Hauglid | 2012-01-09 | 1 | -1/+11 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -9/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed that when using a trigger mysql.proc is now accessed | Michael Widenius | 2011-10-06 | 1 | -9/+13 |
| |/ / / | |||||
* | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -2/+2 |
* | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| |\ \ | | |/ | |/| | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | Changed prefix from ES_ to STMT_ on Query arena state | Mikael Ronstrom | 2011-03-04 | 1 | -1/+1 |
* | | | BUG#59549, fix compiler error on Windows, step 2 | Mikael Ronstrom | 2011-01-20 | 1 | -1/+1 |
* | | | Patch for Bug#55850 (Trigger warnings not cleared). | Alexander Nozdrin | 2010-10-26 | 1 | -1/+1 |
* | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -0/+1 |
* | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -0/+2 |
* | | | 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 | unknown | 2008-05-15 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \ | unknown | 2008-05-15 | 1 | -0/+1 |
* | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51 | unknown | 2008-01-25 | 1 | -2/+3 |
|\ \ | |||||
| * \ | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618 | unknown | 2008-01-23 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | Bug#33618 (Crash in sp_rcontext) | unknown | 2008-01-23 | 1 | -2/+3 |
| | * | Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 | unknown | 2007-11-21 | 1 | -3/+3 |
| | |\ | |||||
* | | \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-14 | 1 | -103/+114 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Doxygenize comments. | unknown | 2007-10-16 | 1 | -103/+114 |
* | | | | Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 | unknown | 2007-11-21 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge adventure.(none):/home/thek/Development/cpp/bug31153/my50-bug31153 | unknown | 2007-11-21 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| |