Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -4/+4 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -4/+8 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-16 | 1 | -2/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | correction to the earlier merging: s/return/DBUG_RETURN/ | Andrei Elkin | 2009-12-14 | 1 | -1/+1 |
| | * | | | | | | merging 5.0-bt -> 5.1-bt to local branch with bug@47210 | Andrei Elkin | 2009-12-14 | 1 | -2/+6 |
| * | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | BUG#45292 orphan binary log created when starting server twice | Alfranio Correia | 2009-12-04 | 1 | -2/+2 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-02 | 1 | -1/+25 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 1 | -8/+14 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with ... | unknown | 2009-11-28 | 1 | -1/+2 |
| * | | | | | | Bug #34739 unexpected binlog file name when --log-bin is set to a directory ... | unknown | 2009-11-05 | 1 | -0/+23 |
* | | | | | | | A prerequisite patch for the fix for Bug#46224 | Konstantin Osipov | 2009-12-22 | 1 | -2/+2 |
* | | | | | | | Backport of revno ## 2617.31.1, 2617.31.3, 2617.31.4, 2617.31.5, | Konstantin Osipov | 2009-12-05 | 1 | -13/+2 |
* | | | | | | | Backport of: | Konstantin Osipov | 2009-12-04 | 1 | -1/+1 |
* | | | | | | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -2/+3 |
* | | | | | | | Initial import of WL#3726 "DDL locking for all metadata objects". | Konstantin Osipov | 2009-11-30 | 1 | -2/+19 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Luis Soares | 2009-10-22 | 1 | -6/+12 |
|\ \ \ \ \ \ | |||||
| * | | | | | | backporting fixes of bug@45940 to 5.1-rpl+2 to cover failures rpl_heartbeat_*... | Andrei Elkin | 2009-10-09 | 1 | -1/+0 |
| * | | | | | | BUG#43075 rpl.rpl_sync fails sporadically on pushbuild | Alfranio Correia | 2009-09-30 | 1 | -4/+8 |
| * | | | | | | BUG#40337 Fsyncing master and relay log to disk after every event is too slow | Alfranio Correia | 2009-09-29 | 1 | -3/+5 |
| * | | | | | | BUG#35542 Add option to sync master and relay log to disk after every event | Alfranio Correia | 2009-09-29 | 1 | -1/+2 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-10-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | |