Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+8 |
|\ | |||||
| * | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -1/+8 |
| |\ | |||||
| | * | BUG#43171 - Assertion failed: thd->transaction.xid_state.xid.is_null() | Sergey Vojtovich | 2009-10-28 | 1 | -1/+8 |
* | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+0 |
| |\ \ | | |/ | |||||
| | * | merge | Georgi Kodinov | 2009-10-16 | 1 | -2/+0 |
| | |\ | |||||
| | | * | Bug#46019: ERROR 1356 When selecting from within another | Martin Hansson | 2009-10-16 | 1 | -2/+0 |
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -17/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -17/+19 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -17/+19 |
| | |/ | |||||
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -7/+19 |
|\ \ \ | |||||
| * | | | Bug#33637 SHOW PROCEDURE CODE/SHOW FUNCTION CODE sp_name gives a syntax error. | Marc Alff | 2009-10-29 | 1 | -2/+6 |
| * | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 1 | -2/+4 |
| |\ \ \ | |||||
| * | | | | Bug#24062 Incorrect error msg after execute DROP TABLE IF EXISTS on informati... | Sergey Glukhov | 2009-10-23 | 1 | -1/+13 |
| * | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony | Sergey Glukhov | 2009-10-23 | 1 | -4/+0 |
* | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -2/+4 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -2/+4 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Manual merge semi-sync to 5.1-rep+2 | He Zhenxing | 2009-10-03 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | Backporting WL#4398 WL#1720 | He Zhenxing | 2009-09-26 | 1 | -0/+1 |
| | * | | | | BUG#23300: Slow query log on slave does not log slow replicated statements | Luis Soares | 2009-09-29 | 1 | -2/+2 |
| | * | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay log | Luis Soares | 2009-09-29 | 1 | -0/+1 |
| | |/ / / | |||||
* | | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -2/+27 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merging mysql-next-mr-merge to mysql-next-mr. | Alexander Barkov | 2009-10-21 | 1 | -1/+4 |
| |\ \ \ \ | |||||
| | * | | | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -1/+4 |
| * | | | | | Merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-19 | 1 | -0/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-19 | 1 | -0/+1 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Bug #43029: FORCE INDEX FOR ORDER BY is ignored when join | Georgi Kodinov | 2009-10-07 | 1 | -0/+1 |
| * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -1/+22 |
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | |||||
| | * | | | Merge from mysql-5.1. | Alexander Nozdrin | 2009-10-13 | 1 | -1/+22 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Manual merge. | Davi Arnaut | 2009-09-30 | 1 | -23/+19 |
| | | |\ \ | |||||
| | | | * | | Post-merge cleanup: Reorganize code for better comprehensibility. | Davi Arnaut | 2009-09-30 | 1 | -24/+20 |
| | | * | | | Manual merge. | Davi Arnaut | 2009-09-30 | 1 | -1/+26 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Post-merge fix: DBUG macros are wrapped inside a loop. | Davi Arnaut | 2009-09-30 | 1 | -1/+7 |
| | | | * | | Bug#47525: MySQL crashed (Federated) | Davi Arnaut | 2009-09-30 | 1 | -0/+20 |
* | | | | | | Automerge from mysql-next-mr-runtime. | Alexander Nozdrin | 2009-10-22 | 1 | -5/+6 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with next-mr-runtime. | Konstantin Osipov | 2009-10-22 | 1 | -155/+278 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -5/+6 |
* | | | | | | | | Backporting patches for Bug#38347 (ALTER ROUTINE privilege | Alexander Nozdrin | 2009-10-22 | 1 | -10/+31 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Automerge | Kristofer Pettersson | 2009-10-19 | 1 | -16/+16 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Introduce thd->query_cache_tls (thread | Konstantin Osipov | 2009-10-13 | 1 | -1/+1 |
| * | | | | | | A backporting patch for WL#4300 (Define privileges for tablespaces). | Alexander Nozdrin | 2009-10-10 | 1 | -1/+1 |
| * | | | | | | This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys" | Dmitry Lenev | 2009-10-09 | 1 | -4/+4 |
| * | | | | | | Bug #44651 "have_community_features" variable should be renamed | Jon Olav Hauglid | 2009-10-09 | 1 | -10/+10 |
| |/ / / / / | |||||
* | | | | | | Bug#27145 EXTRA_ACL troubles | Kristofer Pettersson | 2009-10-19 | 1 | -155/+278 |
|/ / / / / | |||||
* | | | | | Merge mysql-next-mr --> mysql-trunk-signal | Marc Alff | 2009-09-17 | 1 | -21/+32 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2009-09-16 | 1 | -21/+32 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -19/+30 |
| | | |/ | | |/| | |||||
| | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -2/+2 |
| | * | | reverted the fix for bug #46019 from 5.1-bugteam | Georgi Kodinov | 2009-08-21 | 1 | -2/+1 |
| | |\ \ | | | |/ |