Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -15/+22 |
|\ | |||||
| * | Bug#49501 Inefficient information_schema check (system collation), addon | Sergey Glukhov | 2010-01-22 | 1 | -3/+3 |
| * | merge | Mattias Jonsson | 2010-01-19 | 1 | -1/+1 |
| |\ | |||||
| | * | Bug#47343: InnoDB fails to clean-up after lock wait timeout on | Mattias Jonsson | 2010-01-18 | 1 | -1/+1 |
| * | | Bug#49501 Inefficient information_schema check (system collation) | Sergey Glukhov | 2010-01-19 | 1 | -17/+23 |
| * | | BUG#47418 RBR fails, failure with mixup of base/temporary/view | unknown | 2010-01-16 | 1 | -0/+2 |
| |/ | |||||
* | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-15 | 1 | -16/+10 |
|\ \ | |/ | |||||
| * | automerge | Kristofer Pettersson | 2010-01-13 | 1 | -2/+4 |
| |\ | |||||
| | * | Bug#48157: crash in Item_field::used_tables | Martin Hansson | 2010-01-12 | 1 | -2/+4 |
| * | | Bug#33982 debug assertion and crash reloading grant tables after sighup or kill | Kristofer Pettersson | 2010-01-13 | 1 | -3/+6 |
| |/ | |||||
| * | Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE | unknown | 2009-12-31 | 1 | -11/+0 |
| |\ | |||||
| | * | Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE | unknown | 2009-12-31 | 1 | -11/+0 |
| | * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 1 | -1/+1 |
* | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -208/+375 |
|\ \ \ | |||||
| * \ \ | Auto-merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -9/+9 |
| |\ \ \ | |||||
| * \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -1/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 1 | -2/+0 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-05 | 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 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -1/+22 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -21/+26 |
* | | | | | | | | | | | | Automerge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-11-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | auto-merge | Tatiana A. Nurnberg | 2009-11-24 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug#48319: Server crashes on "GRANT/REVOKE ... TO CURRENT_USER" | Tatiana A. Nurnberg | 2009-10-29 | 1 | -0/+5 |
* | | | | | | | | | | | | Fix automerge: use 'thd->query()' instead of 'thd->query'. | Alexander Nozdrin | 2009-11-05 | 1 | -9/+9 |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |