| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-16 | 1 | -6/+22 |
|\ |
|
| * | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -3/+3 |
| |\ |
|
| * | | Bug#49165 Remove unused/confusing code/comments in setup_conds() | Tor Didriksen | 2009-11-27 | 1 | -5/+0 |
| * | | backport of: | Tor Didriksen | 2009-11-30 | 1 | -1/+22 |
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2009-12-15 | 1 | -0/+11 |
|\ \ \
| |/ / |
|
| * | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 1 | -16/+23 |
| |\ \ |
|
| * | | | Bug#9801 Views: imperfect error message | Marc Alff | 2009-11-02 | 1 | -0/+11 |
* | | | | Backport of: | Konstantin Osipov | 2009-12-08 | 1 | -0/+17 |
| |_|/
|/| | |
|
* | | | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -3/+3 |
|\ \ \
| |_|/
|/| | |
|
| * | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -3/+3 |
| |\ \ |
|
| | * | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -3/+3 |
| * | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 1 | -7/+0 |
| |\ \ \
| | |/ /
| |/| | |
|
* | | | | Merge | Mikael Ronstrom | 2009-11-03 | 1 | -13/+20 |
|\ \ \ \ |
|
| * \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -1/+1 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-28 | 1 | -3/+9 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -7/+0 |
| |\ \ \ \ \ |
|
| * | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1, | Konstantin Osipov | 2009-10-22 | 1 | -1/+6 |
| * | | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -12/+12 |
| * | | | | | | This patch is prerequisite for the 2nd milestone of WL#148 "Foreign keys" | Dmitry Lenev | 2009-10-09 | 1 | -0/+2 |
* | | | | | | | Merge to latest mysql-next-mr | Mikael Ronstrom | 2009-11-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \
| | |_|_|/ / /
| |/| | | | | |
|
| * | | | | | | Automerge from mysql-next-mr. | Alexander Nozdrin | 2009-10-27 | 1 | -3/+9 |
| |\ \ \ \ \ \
| | | |_|/ / /
| | |/| | | | |
|
| * | | | | | | Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony | Sergey Glukhov | 2009-10-23 | 1 | -1/+1 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merged WL#3352 into mysql-next-mr | Mikael Ronstrom | 2009-10-28 | 1 | -3/+3 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Removed GLOBAL INDEX syntax, need to develop GLOBAL indexes before adding syn... | Mikael Ronstrom | 2009-10-16 | 1 | -3/+0 |
| * | | | | | Changed all no_ to num_ to avoid strange names like no_list_values which is n... | Mikael Ronstrom | 2009-10-01 | 1 | -3/+3 |
| * | | | | | WL#3352, Introducing Column list partitioning, makes it possible to partition... | Mikael Ronstrom | 2009-09-15 | 1 | -0/+3 |
* | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -3/+9 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | / /
| | |_|/ /
| |/| | | |
|
| * | | | | merge from 5.1-rpl+2 repo to a local branch with HB and bug@27808 fixes | Andrei Elkin | 2009-10-01 | 1 | -1/+1 |
| |\ \ \ \ |
|
| | * | | | | BUG#28777, WL#4293: SHOW BINLOG EVENTS does not work on relay log | Luis Soares | 2009-09-29 | 1 | -1/+1 |
| * | | | | | backporting bug@27808 fixes | Andrei Elkin | 2009-10-01 | 1 | -1/+2 |
| * | | | | | WL#342 heartbeat | Andrei Elkin | 2009-09-29 | 1 | -2/+3 |
| |/ / / / |
|
| * | | | | WL#5016: Fix header file include guards | Mats Kindahl | 2009-09-23 | 1 | -0/+4 |
| |/ / / |
|
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -7/+0 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s... | Tatiana A. Nurnberg | 2009-09-28 | 1 | -7/+0 |
| |/ |
|
* | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -1/+97 |
|/ |
|
* | Manual merge. | Davi Arnaut | 2009-08-10 | 1 | -4/+4 |
|\ |
|
* \ | merged 5.0-bugteam to 5.1-bugteam | Georgi Kodinov | 2009-05-27 | 1 | -0/+2 |
|\ \ |
|
| * | | Bug #38159: Function parsing problem generates misleading error message | Georgi Kodinov | 2009-05-27 | 1 | -0/+2 |
| |/ |
|
| * | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -1/+9 |
| |\ |
|
| | * | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -3/+56 |
| | |\ |
|
| | * \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -1/+10 |
| | |\ \ |
|
| | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -1/+9 |
| | |\ \ \ |
|
| | | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-10-10 | 1 | -1/+9 |
| | | |\ \ \ |
|
| | | | * \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-09-10 | 1 | -1/+9 |
| | | | |\ \ \ |
|
| | | | | * \ \ | Merge mysqldev@production.mysql.com:my/mysql-5.0-release | unknown | 2007-07-02 | 1 | -1/+9 |
| | | | | |\ \ \ |
|
* | | | | | \ \ \ | Merge fix for bug 39559 and bugteam trunk. | Chad MILLER | 2009-04-10 | 1 | -0/+14 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Bug#39559: dump of stored procedures / functions with C-style \ | Chad MILLER | 2009-04-09 | 1 | -0/+14 |
* | | | | | | | | | | Merge Bug#43230 into mysql-5.1-bugteam | Davi Arnaut | 2009-04-03 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / /
| |/| | | | | | | | |
|
| * | | | | | | | | | Bug#43230: SELECT ... FOR UPDATE can hang with FLUSH TABLES WITH READ LOCK in... | Davi Arnaut | 2009-04-03 | 1 | -0/+16 |
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
* | | | | | | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ \
| | |/ / / / / / /
| |/| | | | | | | |
|