| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+3 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+3 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+3 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -4/+3 |
| | | | |\ | |||||
| | | | | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -4/+3 |
| | | | |/ | |||||
| * | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -6/+3 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -6/+3 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -6/+3 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -4/+6 |
| * | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |||||
| | | * | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -1/+1 |
| * | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -12/+18 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -11/+0 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -11/+0 |
| | | |\ \ | | | |/ | |||||
| | | | * | Bug#51591 deadlock in the plugins+status+variables | Staale Smedseng | 2010-04-19 | 1 | -11/+0 |
| | * | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
| | * | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -7/+12 |
| |\ \ \ | |/ / | |||||
| | * | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 1 | -0/+2 |
| | * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+10 |
| | |\ \ | | |/ | |||||
| | | * | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -6/+7 |
| | | * | A patch for Bug#47474 (mysqld hits Dbug_violation_helper assert | Alexander Nozdrin | 2009-09-23 | 1 | -1/+3 |
| * | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+3 |
| |/ / | |||||
| * | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -21/+25 |
| |\ \ | |/ | |||||
| | * | Bug#44834 strxnmov is expected to behave as you'd expect | Sergey Glukhov | 2009-06-19 | 1 | -21/+25 |
| * | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -2/+8 |
| |\ \ | |/ | |||||
| | * | Merging 5.1 main into 5.1-rpl | Mats Kindahl | 2008-10-23 | 1 | -18/+7 |
| | |\ | |||||
| | * \ | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl | unknown | 2008-03-25 | 1 | -2/+8 |
| | |\ \ | |||||
| | | * \ | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl | unknown | 2008-02-28 | 1 | -2/+8 |
| | | |\ \ | |||||
| | | | * | | Bug#33763 Mysqld leaves readonly mode for cluster tables too early - part2 | unknown | 2008-01-09 | 1 | -2/+8 |
| * | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -5/+10 |
| * | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -18/+7 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | bug #31231 mysql_alter_table() tries to drop a non-existing table | Martin Skold | 2008-09-15 | 1 | -18/+7 |
| | |/ / / | |||||
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 1 | -3/+3 |
| * | | | | Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 | unknown | 2008-02-26 | 1 | -1/+1 |
| |\ \ \ \ | |_|/ / |/| | | | |||||
| | * | | | Fix for Bug#30217: Views: changes in metadata behaviour | unknown | 2008-02-22 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1 | unknown | 2008-02-11 | 1 | -43/+51 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | Bug #34275 mysqld leak if doing multiple statements within same transaction (... | unknown | 2008-02-04 | 1 | -39/+44 |
| | * | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb | unknown | 2008-01-25 | 1 | -4/+7 |
| | |\ \ | |||||
| | | * | | Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc: | unknown | 2008-01-23 | 1 | -4/+7 |
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint | unknown | 2007-12-20 | 1 | -33/+94 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-12-15 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | | * | | Bug#32395 Alter table under a impending global read lock causes a server crash | unknown | 2007-12-12 | 1 | -2/+2 |
| | | |/ | |||||
| | * | | Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 | unknown | 2007-12-10 | 1 | -24/+85 |
| | |\ \ | |||||
| | | * | | Removed illegal cast | unknown | 2007-12-07 | 1 | -1/+1 |
| | | * | | Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb | unknown | 2007-12-07 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | Removed illegal cast | unknown | 2007-12-07 | 1 | -1/+1 |
| | | * | | | Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb | unknown | 2007-12-07 | 1 | -2/+2 |
| | | |\ \ \ | | | |/ / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |