Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -0/+1 |
|\ | |||||
| * | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -0/+1 |
| |\ | |||||
| | * | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay log | Luis Soares | 2009-09-29 | 1 | -0/+1 |
* | | | Merge with next-mr-runtime. | Konstantin Osipov | 2009-10-22 | 1 | -2/+3 |
|\ \ \ | |||||
| * \ \ | Automerge | Kristofer Pettersson | 2009-10-19 | 1 | -17/+22 |
| |\ \ \ | |||||
| * | | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-10-19 | 1 | -2/+3 |
| | |/ / | |/| | | |||||
* | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -4/+15 |
| |/ / |/| | | |||||
* | | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -4/+8 |
* | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -8/+9 |
* | | | Bug #44651 "have_community_features" variable should be renamed | Jon Olav Hauglid | 2009-10-09 | 1 | -5/+5 |
|/ / | |||||
* | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -9/+24 |
* | | merge of 5.1-main into mysql-trunk. | Guilhem Bichot | 2009-08-12 | 1 | -6/+4 |
|\ \ | |/ | |||||
| * | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ... | Kristofer Pettersson | 2009-07-29 | 1 | -2/+2 |
| * | Merge from 5.0 | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| |\ | |||||
| | * | Bug #38816: kill + flush tables with read lock + stored | Gleb Shchepa | 2009-07-24 | 1 | -4/+2 |
| | * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -2/+31 |
| | |\ | |||||
| | | * | Pull 5.1 treatment of community features into 5.0. | Chad MILLER | 2009-05-05 | 1 | -5/+5 |
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -8/+13 |
| | | |\ | |||||
| | | * \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+10 |
| | | |\ \ | |||||
| | | * \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -0/+4 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -1/+7 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | cmiller@zippy.cornsilk.net | 2007-12-10 | 1 | -2/+31 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Push history-limiting code until after the code that adds new | cmiller@zippy.cornsilk.net | 2007-11-14 | 1 | -0/+29 |
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | cmiller@zippy.cornsilk.net | 2007-09-10 | 1 | -2/+2 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | cmiller@zippy.cornsilk.net | 2007-07-02 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | cmiller@zippy.cornsilk.net | 2007-04-26 | 1 | -2/+2 |
| | | | | | |\ \ \ \ \ | |||||
* | | | | | | \ \ \ \ \ | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}: | Guilhem Bichot | 2009-08-04 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -1/+2 |
* | | | | | | | | | | | | Merge MySQL 5.1.35 into MySQL 5.4 | Mikael Ronstrom | 2009-06-11 | 1 | -13/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Bug#43962 "Packets out of order" calling a SHOW TABLE STATUS | Sergey Glukhov | 2009-04-30 | 1 | -0/+1 |
| * | | | | | | | | | | | merging | Alexey Botchkov | 2009-04-29 | 1 | -13/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | merging | Alexey Botchkov | 2009-04-28 | 1 | -13/+14 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Bug#25058 ignored return codes in memory allocation functions | Alexey Botchkov | 2008-11-21 | 1 | -13/+14 |
| | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Auto merge | He Zhenxing | 2009-04-08 | 1 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -1/+2 |
| * | | | | | | | | | | | Manual merge. | Ramil Kalimullin | 2009-03-25 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Fix for bug#35383: binlog playback and replication breaks | Ramil Kalimullin | 2009-03-25 | 1 | -0/+5 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -8/+8 |
| | |/ / / / / / / / | |||||
* | | | | | | | | | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01... | Mikael Ronstrom | 2009-02-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
* | | | | | | | | | | DTrace fixes plus fixing a too long file name | Mikael Ronstrom | 2008-12-22 | 1 | -1/+1 |
* | | | | | | | | | | Merge dtrace patch with latest performance version | Mikael Ronstrom | 2008-12-20 | 1 | -3/+10 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | merged 5.1-5.1.29-rc -> 5.1-bugteam | Georgi Kodinov | 2008-10-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc | Gleb Shchepa | 2008-10-07 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | _ / / / / / / / | | | / / / / / / / | |||||
| | * | | | | | | | | merge | Ramil Kalimullin | 2008-10-02 | 1 | -1/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge | Ramil Kalimullin | 2008-10-02 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Fix for bug#39182: Binary log producing incompatible character set query | Ramil Kalimullin | 2008-10-01 | 1 | -0/+3 |
| * | | | | | | | | | | merging | Alexey Botchkov | 2008-09-30 | 1 | -1/+5 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Bug#37949 Crash if argument to SP is a subquery that returns more than one row | Alexey Botchkov | 2008-09-29 | 1 | -1/+5 |
| | |/ / / / / / / / | |||||
* | | | | | | | | | | Backport of DTrace patches from 6.0 | Mikael Ronstrom | 2008-12-20 | 1 | -0/+8 |
|/ / / / / / / / / |