Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+1 |
|\ | |||||
| * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -0/+1 |
* | | Fixed a build failure in mysql-trunk-merge caused by a bad | Alexey Kopytov | 2009-12-28 | 1 | -3/+3 |
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-25 | 1 | -2/+9 |
|\ \ | |/ | |||||
| * | Bug#47649 crash during CALL procedure | Sergey Glukhov | 2009-12-23 | 1 | -2/+9 |
* | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -33/+65 |
|\ \ | |||||
| * \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -14/+17 |
| |\ \ \ | |||||
| * \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -4/+5 |
| |\ \ \ \ | |||||
| * | | | | | Backport a patch from 6.0: | Alexander Nozdrin | 2009-11-02 | 1 | -1/+1 |
| * | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 1 | -0/+1 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony | Sergey Glukhov | 2009-10-23 | 1 | -1/+0 |
| * | | | | | | | 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 |
* | | | | | | | Manual merge from the mysql-5.1-bugteam. | Alexey Kopytov | 2009-11-24 | 1 | -6/+18 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | merge | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -6/+18 |
* | | | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -14/+17 |
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | |||||
| * | | | | Bug #47412: Valgrind warnings / user can read uninitalized memory using | Georgi Kodinov | 2009-10-26 | 1 | -14/+17 |
| |/ / / | |||||
* | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -4/+5 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -4/+5 |
| |/ | |||||
* | | 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 | unknown | 2007-12-10 | 1 | -2/+31 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Push history-limiting code until after the code that adds new | unknown | 2007-11-14 | 1 | -0/+29 |
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -2/+2 |
| | | | |\ \ \ \ \ | |||||
| | | | | * \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ | |||||
| | | | | | * \ \ \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |