| Commit message (Expand) | Author | Age | Files | Lines |
* | merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ |
|
| * | Some after-merge fixes for 5.5 merge. | unknown | 2011-10-25 | 1 | -1/+2 |
* | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ |
|
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -10/+13 |
|\ \ \ |
|
| * \ \ | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -5/+1 |
| |\ \ \ |
|
| | * | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -5/+1 |
| | | |/
| | |/| |
|
| * | | | Merge MWL#180, binlog checksum backport, into MariaDB 5.3-based tree. | unknown | 2011-05-03 | 1 | -3/+6 |
| |\ \ \ |
|
| | * | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -3/+6 |
| * | | | | Merge various replication-related patches into MariaDB 5.3: | unknown | 2011-04-08 | 1 | -1/+3 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -1/+3 |
| * | | | | Fix build error (wrong printf-like format) | Vladislav Vaintroub | 2011-03-28 | 1 | -1/+1 |
| * | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi... | Michael Widenius | 2011-03-23 | 1 | -1/+2 |
| |/ / / |
|
* | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -1/+25 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | BUG#12558519 | Luis Soares | 2011-05-24 | 1 | -0/+10 |
| |\ \ \ |
|
| | * | | | BUG#12558519: RPL_TYPECONV PRODUCES VALGRIND STACK | Luis Soares | 2011-05-23 | 1 | -0/+10 |
| * | | | | Merge 5.5 | Mikael Ronström | 2011-04-15 | 1 | -1/+8 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Bug#11766528 PERFORMANCE_SCHEMA TRACKS BOTH BINARY AND RELAY LOGS IN THE SAME... | Marc Alff | 2011-03-01 | 1 | -1/+8 |
| * | | | | merge | Mikael Ronstrom | 2011-01-04 | 1 | -0/+3 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -0/+3 |
| * | | | | Added THD wait state for MASTER POS WAIT | Mikael Ronstrom | 2010-10-28 | 1 | -0/+4 |
| |/ / / |
|
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+1 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+1 |
| |\ \
| | |/ |
|
| * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+1 |
| |\ \ |
|
| * \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -4/+8 |
| |\ \ \ |
|
| * \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -1/+25 |
| |\ \ \ \ |
|
| * | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+1 |
| * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -3/+11 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -5/+0 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Merge latest XtraDB from lp:percona-xtradb into MariaDB. | unknown | 2009-06-11 | 1 | -5/+0 |
| * | | | | | | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
| | * | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ |
|
| * | \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \
| | |_|/ / / / / / /
| |/| | / / / / / /
| | | |/ / / / / /
| | |/| | | | | | |
|
| * | | | | | | | | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -1/+1 |
* | | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -0/+16 |
* | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -1/+1 |
* | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | /
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -2/+1 |
| | |_|_|_|_|_|/
| |/| | | | | | |
|
| * | | | | | | | BUG#53657: Slave crashed with error 22 when trying to lock mutex | Luis Soares | 2010-05-24 | 1 | -1/+1 |
| | |_|_|_|_|/
| |/| | | | | |
|
* | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -2/+7 |
* | | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | BUG#50364: manual merge to mysql-next-mr-bugfixing. | Luis Soares | 2010-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | BUG#50364: FLUSH LOGS crashes the server (rpl.rpl_heartbeat_basic | Luis Soares | 2010-02-03 | 1 | -1/+1 |
* | | | | | | | | | Merge next-mr -> next-4284 | Konstantin Osipov | 2010-02-03 | 1 | -48/+53 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / / |
|
| * | | | | | | | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -48/+53 |
* | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-03 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / / |
|