Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 74 | -133/+49 |
* | merge. | Sergei Golubchik | 2010-11-25 | 22 | -73/+195 |
|\ | |||||
| * | Fixed LP bug #668644. | Igor Babaev | 2010-11-08 | 2 | -2/+72 |
| * | 5.2 merge | Sergei Golubchik | 2010-10-28 | 4 | -5/+197 |
| |\ | |||||
| | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 4 | -5/+197 |
| | |\ | |||||
| * | | | Merge MariaDB 5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-10-14 | 1 | -3/+3 |
| * | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 55 | -17/+10904 |
| |\ \ \ | | |/ / | |||||
| | * | | Enable tests that were previously disabled waiting for XtraDB merge. | unknown | 2010-09-03 | 1 | -1/+0 |
| | * | | Fixed failing tests | Michael Widenius | 2010-08-28 | 2 | -0/+4 |
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 6 | -0/+326 |
| | |\ \ | |||||
| | * | | | generalization of mtr to support suite.pm extensions: | Sergei Golubchik | 2010-08-17 | 13 | -12/+13 |
| | * | | | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB. | unknown | 2010-08-04 | 8 | -31/+41 |
| | * | | | Disable some tests that is waiting for next merge with xtradb | Michael Widenius | 2010-08-02 | 1 | -0/+2 |
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 42 | -0/+10542 |
| | |\ \ \ | |/ / / / | |||||
| * | | | | Fixed compiler warnings | Michael Widenius | 2010-05-27 | 2 | -1/+6 |
| * | | | | Resolve bzr conflicts | Michael Widenius | 2010-05-26 | 1 | -0/+48 |
| * | | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 88 | -4706/+5323 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 9 | -14/+246 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 7 | -1/+107 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 8 | -80/+206 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 10 | -80/+209 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Merge XtraDB 8 into MariaDB. | unknown | 2009-11-13 | 4 | -105/+0 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Don't test innodb-use-sys-malloc under Valgrind. | unknown | 2009-09-12 | 1 | -0/+3 |
* | | | | | | | | | test result updated to match [incorrect] mysql result. | Sergei Golubchik | 2010-11-05 | 1 | -1/+1 |
* | | | | | | | | | mysql-5.1 -> mysql-5.5 merge | Sergei Golubchik | 2010-11-05 | 8 | -0/+173 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix Bug #57255 Cascade Delete results in "Got error -1 from storage engine". | Jimmy Yang | 2010-10-06 | 2 | -0/+46 |
| * | | | | | | | | | merged mysql-5.1 into mysql-5.1-bugteam | Georgi Kodinov | 2010-10-05 | 4 | -1/+52 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge from mysql-5.1-bugteam to mysql-5.1-security | Jimmy Yang | 2010-09-01 | 2 | -0/+88 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge | Georgi Kodinov | 2010-08-20 | 2 | -8/+59 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug #55826: create table .. select crashes with when | Georgi Kodinov | 2010-08-20 | 2 | -0/+28 |
| | * | | | | | | | | | | Fix Bug #55277 - Failing assertion: auto_inc > 0 | Sunny Bains | 2010-08-05 | 2 | -0/+25 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteam | Vasil Dimov | 2010-10-04 | 2 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug#56716 InnoDB locks a record gap without locking the table | Marko Mäkelä | 2010-10-04 | 2 | -0/+14 |
| * | | | | | | | | | | | merge from 5.1-mtr | Bjorn Munch | 2010-10-03 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Small test fix after 56753 | Bjorn Munch | 2010-09-30 | 1 | -2/+2 |
| | * | | | | | | | | | | merge from 5.1 | Bjorn Munch | 2010-09-29 | 5 | -0/+325 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
* | | | | | | | | | | | | Merge from 5.1-bugteam | Magne Mahre | 2010-09-16 | 2 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Bug#39932 "create table fails if column for FK is in different | Magne Mahre | 2010-09-01 | 2 | -0/+38 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Auto-merge from mysql-5.5. | Alexander Nozdrin | 2010-08-30 | 3 | -24/+28 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Auto-merge from mysql-5.5-merge. | Alexander Nozdrin | 2010-08-25 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge from mysql-5.5-bugfixing to mysql-5.5-runtime | Jon Olav Hauglid | 2010-08-18 | 1 | -3/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -3/+6 |
| * | | | | | | | | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime. | Jon Olav Hauglid | 2010-08-18 | 3 | -24/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge mysql-5.5-bugfixing -> mysql-5.5-innodb | Vasil Dimov | 2010-08-18 | 1 | -4/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | merge from trunk-mtr | Bjorn Munch | 2010-08-05 | 1 | -4/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | merge from trunk | Bjorn Munch | 2010-07-23 | 4 | -0/+167 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | merge from trunk | Bjorn Munch | 2010-07-14 | 54 | -147/+6677 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | Adjust innodb_gis.result | Vasil Dimov | 2010-08-17 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Adjust innodb_mysql.result | Vasil Dimov | 2010-08-17 | 1 | -19/+19 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK and | Dmitry Lenev | 2010-08-06 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / / |