Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -21/+154 |
|\ | |||||
| * | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -5/+21 |
| |\ | |||||
| | * | comments | Sergei Golubchik | 2011-05-21 | 1 | -0/+1 |
| | * | lp:705210 Compiling with BUILD/compile-pentium64-debug fails | Sergei Golubchik | 2011-03-26 | 1 | -1/+1 |
| | * | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -5/+20 |
| * | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 1 | -22/+95 |
| * | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 1 | -6/+3 |
| |\ \ | |||||
| | * \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -6/+3 |
| | |\ \ | |||||
| | | * \ | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -6/+3 |
| | | |\ \ | |||||
| * | | \ \ | Merge | unknown | 2011-01-10 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge Percona patch row_based_replication_without_primary_key.patch into Mari... | unknown | 2010-12-27 | 1 | -0/+3 |
| | |/ / / / | |||||
| * | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 1 | -1/+61 |
| |/ / / / | |||||
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -3/+5 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -2/+0 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -9/+8 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.cc | unknown | 2010-12-21 | 1 | -6/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.cc | unknown | 2010-12-21 | 1 | -6/+3 |
| | | |_|/ | | |/| | | |||||
| * | | | | BUG#56343 binlog_cache_use status is bigger than expected | Alfranio Correia | 2010-11-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | BUG#56343 binlog_cache_use status is bigger than expected | Alfranio Correia | 2010-10-06 | 1 | -1/+1 |
| * | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam. | Davi Arnaut | 2010-10-19 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -2/+2 |
| * | | | | | Automerge from mysql-5.1-bugteam into mysql-5.5-bugteam. | Luis Soares | 2010-10-13 | 1 | -1/+3 |
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | |||||
| | * | | | BUG#38718: slave sql thread crashes when reading relay log | Luis Soares | 2010-10-06 | 1 | -1/+3 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -4/+22 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+7 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+7 |
| | |\ \ | | | |/ | |||||
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+3 |
| | |\ \ | |||||
| * | \ \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -6/+26 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -6/+26 |
| | |\ \ \ | |||||
| * | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+1 |
| * | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -2/+17 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -2/+17 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -2/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -2/+6 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -3/+3 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database | Sergey Petrunya | 2009-10-24 | 1 | -2/+14 |
| * | | | | | | | | MWL#36: Add a mysqlbinlog option to change the used database. | Alexander Ivanov | 2009-10-16 | 1 | -0/+2 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -4/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Merge latest XtraDB from lp:percona-xtradb into MariaDB. | unknown | 2009-06-11 | 1 | -0/+4 |
* | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -6/+6 |
* | | | | | | | | | | | Manul merge | unknown | 2010-07-04 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | The following statements support the CURRENT_USER() where a user is needed. | unknown | 2010-07-04 | 1 | -1/+6 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-28 | 1 | -6/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Revert Bug#48321 due to build breakage and failing tests. | Davi Arnaut | 2010-06-28 | 1 | -6/+1 |
* | | | | | | | | | | Manual merge | unknown | 2010-06-27 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | | |