Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 49 | -503/+4750 |
|\ | |||||
| * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 49 | -503/+4750 |
| |\ | |||||
| | * | Merge XtraDB from Percona-Server 5.1.66-rel14.1 into MariaDB 5.1. | unknown | 2012-11-01 | 49 | -448/+4582 |
* | | | merge | Sergei Golubchik | 2012-09-27 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge from 5.1. | unknown | 2012-09-26 | 1 | -6/+6 |
| |\ \ | | |/ | |||||
| | * | Fix some failures in 5.1 Buildbot: | unknown | 2012-09-26 | 1 | -6/+6 |
* | | | remove mysql-5.1 assert that is already absent in mysql-5.5 | Sergei Golubchik | 2012-08-23 | 1 | -1/+0 |
* | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 98 | -1657/+3124 |
|\ \ \ | |/ / | |||||
| * | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 98 | -1657/+3124 |
| |\ \ | | |/ | |||||
| | * | merge with XtraDB as of Percona-Server-5.1.63-rel13.4 | Sergei Golubchik | 2012-08-22 | 98 | -1656/+3123 |
* | | | MDEV-308 lp:1008516 - Failing assertion: templ->mysql_col_len == len | Sergei Golubchik | 2012-06-04 | 1 | -1/+0 |
* | | | merge | Vladislav Vaintroub | 2012-04-16 | 1 | -21/+13 |
|\ \ \ | |/ / | |||||
| * | | merge | Vladislav Vaintroub | 2012-04-16 | 1 | -21/+13 |
| |\ \ | |||||
| | * | | backport a change from 5.5 to remove thread sleeps from Innodb assertions on ... | Vladislav Vaintroub | 2012-04-16 | 1 | -21/+13 |
* | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+3 |
* | | | | Bug fix for MySQL bug#61209 "auto_increment_offset != 1 + innodb_autoinc_lock... | Michael Widenius | 2012-03-26 | 1 | -52/+15 |
* | | | | merge | Sergei Golubchik | 2012-03-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge | Sergei Golubchik | 2012-03-21 | 1 | -1/+1 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fix access to uninitialized variable in innodb error message in case WriteFil... | Vladislav Vaintroub | 2012-03-15 | 1 | -1/+1 |
* | | | fix for | Sergei Golubchik | 2012-02-20 | 1 | -1/+0 |
* | | | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 2 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 2 | -2/+1 |
| |\ \ | | |/ | |||||
| | * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 2 | -2/+1 |
* | | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 4 | -31/+2 |
* | | | Counters for Index Condition Pushdown added (MDEV-130). | unknown | 2012-02-16 | 2 | -1/+9 |
* | | | Back-ported the fix for bug #12831587 from mysql-5.6 code line. | Igor Babaev | 2012-02-03 | 1 | -10/+30 |
* | | | Applied the patch from mysql-5.6 code line that fixed | Igor Babaev | 2012-02-02 | 1 | -13/+16 |
* | | | Fix compiler warning on Windows. | Vladislav Vaintroub | 2012-01-19 | 1 | -0/+1 |
* | | | MDEV-77 - possible deadlock in XtraDB async io subsystem on Windows. | Vladislav Vaintroub | 2012-01-08 | 1 | -11/+45 |
* | | | 5.2->5.3 merge | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
* | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 88 | -2992/+4380 |
|\ \ \ | |/ / | |||||
| * | | Merge with 5.1 | Michael Widenius | 2011-11-30 | 4 | -17/+23 |
| |\ \ | | |/ | |||||
| | * | Fixed compiler warning and errors | Michael Widenius | 2011-11-30 | 1 | -2/+2 |
| | * | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | * | Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE V... | unknown | 2011-11-30 | 3 | -11/+20 |
| | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 2 | -3/+1 |
| | * | Fix Windows build, and a conversion truncation warning. | Vladislav Vaintroub | 2011-11-29 | 3 | -7/+6 |
| * | | merge, fix Windows warnings | Vladislav Vaintroub | 2011-11-29 | 3 | -3/+3 |
| * | | after merge fixes | Sergei Golubchik | 2011-11-28 | 2 | -6/+6 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 88 | -2989/+4370 |
| |\ \ | | |/ | |||||
| | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+1 |
| | * | Merge XtraDB from Percona-Server-5.1.59-13 into MariaDB 5.1. | unknown | 2011-11-21 | 88 | -2954/+4335 |
* | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 2 | -3/+3 |
|\ \ \ | |||||
| * \ \ | 5.1 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | typos fixed | Sergei Golubchik | 2011-11-08 | 1 | -1/+1 |
| * | | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 3 | -8/+7 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 3 | -8/+7 |
* | | | Remove unused variable detected by GCC 4.6.1. | unknown | 2011-11-12 | 1 | -2/+1 |