| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge MySQL 5.1.42 and XtraDB 9 into MariaDB trunk, after fixing test failures. | unknown | 2010-01-17 | 1 | -100/+197 |
|\ |
|
| * | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -100/+197 |
| |\ |
|
| | * | Automerge. | Davi Arnaut | 2009-11-25 | 1 | -12/+33 |
| | |\ |
|
| | | * | merge | Kristofer Pettersson | 2009-11-20 | 1 | -12/+25 |
| | | |\ |
|
| | | | * | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -12/+25 |
| | | * | | BUG#47995: Mark system functions as unsafe | Sven Sandberg | 2009-11-18 | 1 | -0/+8 |
| | * | | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crash | Davi Arnaut | 2009-11-12 | 1 | -88/+164 |
| | |/ / |
|
* | | | | Fixed that we use same flags when testing for assembler as by makefiles. | Michael Widenius | 2010-01-15 | 1 | -18/+5 |
|/ / / |
|
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -13/+12 |
|\ \ \
| |/ / |
|
| * | | merge | Georgi Kodinov | 2009-10-30 | 1 | -2/+1 |
| |\ \ |
|
| | * | | Bug #48293: crash with procedure analyse, view with > 10 columns, | Georgi Kodinov | 2009-10-30 | 1 | -2/+1 |
| | * | | Bug#34895 'show procedure status' or 'show function status' + | Kristofer Pettersson | 2009-09-30 | 1 | -4/+0 |
| | * | | Bug#42108 Wrong locking for UPDATE with subqueries leads to broken statement | Kristofer Pettersson | 2009-09-29 | 1 | -1/+1 |
| * | | | Revert the fix for bug #47627 as it's causing the regression tests in pb2 to | Georgi Kodinov | 2009-10-23 | 1 | -47/+14 |
| | |/
| |/| |
|
| * | | automerge | Kristofer Pettersson | 2009-10-20 | 1 | -14/+47 |
| |\ \ |
|
| | * | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crash | Kristofer Pettersson | 2009-10-19 | 1 | -14/+47 |
| * | | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -1/+1 |
| |/ / |
|
| * | | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s... | Tatiana A. Nurnberg | 2009-09-28 | 1 | -9/+3 |
| * | | Bug#46259: 5.0.83 -> 5.1.36, query doesn't work | Martin Hansson | 2009-09-07 | 1 | -1/+7 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -6/+8 |
|\ \ \
| |/ / |
|
| * | | Bug #44331 Restore of database with events produces warning in replication | unknown | 2009-08-29 | 1 | -3/+4 |
| * | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-08-27 | 1 | -1/+2 |
| |\ \
| | |/ |
|
| | * | Bug#46184 Crash, SELECT ... FROM derived table procedure analyze | Sergey Glukhov | 2009-08-27 | 1 | -1/+2 |
| | * | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -11/+12 |
| * | | merge | Mattias Jonsson | 2009-08-12 | 1 | -8/+0 |
| |\ \ |
|
| | * | | A follow up patch for Bug#45829 "CREATE TABLE TRANSACTIONAL | Konstantin Osipov | 2009-08-12 | 1 | -8/+0 |
| * | | | merge | Mattias Jonsson | 2009-08-12 | 1 | -2/+2 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Bug#39893: Crash if select on a partitioned table, when partitioning is disabled | Mattias Jonsson | 2009-01-08 | 1 | -2/+2 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -89/+133 |
|\ \ \ \
| |/ / / |
|
| * | | | Bug# 30946: mysqldump silently ignores --default-character-set | Gleb Shchepa | 2009-07-31 | 1 | -0/+2 |
| * | | | Bug#46354, when defining partitions without subpartition definition after def... | Mikael Ronstrom | 2009-07-29 | 1 | -0/+21 |
| * | | | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,... | Guilhem Bichot | 2009-07-29 | 1 | -15/+0 |
| * | | | automerge | Georgi Kodinov | 2009-07-16 | 1 | -0/+6 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Bug #45287: phase 1 : 32 bit compilation warnings | Georgi Kodinov | 2009-07-15 | 1 | -0/+6 |
| * | | | Bug #41156: List of derived tables acts like a chain of | Gleb Shchepa | 2009-07-11 | 1 | -0/+5 |
| | | | | |
| | \ \ | |
| *-. \ \ | Merge from 5.0-bugteam | Staale Smedseng | 2009-06-17 | 1 | -3/+3 |
| |\ \ \ \
| | | |/ / |
|
| | | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-17 | 1 | -3/+3 |
| | * | | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-06-10 | 1 | -3/+3 |
| | |/ / |
|
| * | | | Manual merge. | Alexey Kopytov | 2009-06-01 | 1 | -5/+6 |
| |\ \ \
| | |/ / |
|
| | * | | Bug #44767: invalid memory reads in password() and | Alexey Kopytov | 2009-05-27 | 1 | -5/+6 |
| | * | | Merge community up to enterprise, thus ending the community-server | Chad MILLER | 2009-05-06 | 1 | -0/+94 |
| | |\ \ |
|
| | | * \ | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. | Chad MILLER | 2009-04-14 | 1 | -0/+5 |
| | | |\ \ |
|
| | | * \ \ | Merged from 5.0 (enterprise). | Chad MILLER | 2008-12-17 | 1 | -371/+1469 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge from mysql-5.0.66-release | Jonathan Perkin | 2008-07-17 | 1 | -45/+48 |
| | | |\ \ \ \ |
|
| | | * \ \ \ \ | Merge from 5.0 trunk. | Chad MILLER | 2008-07-14 | 1 | -27/+26 |
| | | |\ \ \ \ \ |
|
| | | * \ \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -11/+32 |
| | | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ | Merge chunk from trunk. | Chad MILLER | 2008-07-10 | 1 | -67/+118 |
| | | |\ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | unknown | 2007-12-10 | 1 | -0/+94 |
| | | |\ \ \ \ \ \ \ \ |
|
| * | | \ \ \ \ \ \ \ \ | merging | Alexey Botchkov | 2009-04-29 | 1 | -82/+87 |
| |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / |
|
| | * | | | | | | | | | | merging | Alexey Botchkov | 2009-04-28 | 1 | -82/+90 |
| | |\ \ \ \ \ \ \ \ \ \ |
|