Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 4 | -16/+67 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 4 | -15/+47 |
| |\ | |||||
| | * | build dynamic plugins with the -shared libtool option to avoid | Sergei Golubchik | 2010-09-09 | 1 | -2/+2 |
| | * | Enable archive tables to work with mysql_upgrade / repair | Michael Widenius | 2010-09-03 | 3 | -12/+44 |
| | * | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+2 |
| | |\ | |||||
| * | \ | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -3/+2 |
| | |\ \ | |||||
| * | \ \ | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 2 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 2 | -2/+2 |
| * | | | | Fix for LP#588599, mysqlbug#45377: ARCHIVE tables aren't discoverable after O... | Michael Widenius | 2010-07-21 | 1 | -3/+19 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -12/+23 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -12/+23 |
| | |\ \ \ | |||||
| * | | | | | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
| |/ / / / | |||||
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 3 | -5/+32 |
| |\ \ \ \ \ | |||||
| * | | | | | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 1 | -2/+1 |
| * | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -9/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 2 | -15/+4 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35. | unknown | 2009-05-22 | 1 | -36/+4 |
| * | | | | | | | | 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 |
| * | | | | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 3 | -7/+9 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix Valgrind errors seen in buildbot. | unknown | 2009-04-08 | 1 | -2/+36 |
| * | | | | | | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t" | unknown | 2008-05-29 | 2 | -2/+2 |
* | | | | | | | | | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect). | Alexander Nozdrin | 2010-08-12 | 1 | -3/+2 |
* | | | | | | | | | | | | | Bug#45377: ARCHIVE tables aren't discoverable after OPTIMIZE | Davi Arnaut | 2010-07-26 | 3 | -12/+48 |
* | | | | | | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 2 | -11/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 2 | -11/+10 |
* | | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-09 | 1 | -2/+2 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -3/+2 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-05-20 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Another incarnation of the patch for Bug#30708 | Alexander Nozdrin | 2010-05-19 | 1 | -3/+0 |
* | | | | | | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-04-27 | 2 | -12/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | only This is a backport of the patch for 47739 into trunk. | Horst.Hunger | 2010-04-26 | 1 | -10/+10 |
| * | | | | | | | | | | | Merge fixes for BUG46587 and BUG47059 to trunk-bugfixing. | Sergey Vojtovich | 2010-04-15 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | BUG#46587 - archive storage engine headers don't include | Sergey Vojtovich | 2010-04-15 | 1 | -2/+1 |
* | | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+2 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | BUG#46565 - repair of partition fail for archive engine | Sergey Vojtovich | 2010-03-25 | 1 | -4/+10 |
* | | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -8/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -8/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | BUG#48757 - missing .ARZ file causes server crash | Sergey Vojtovich | 2010-02-12 | 1 | -8/+13 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| * | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
* | | | | | | | | | | | merge | Vladislav Vaintroub | 2010-02-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ |