Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-02-21 | 9 | -76/+19 |
|\ | |||||
| * | fix for | Sergei Golubchik | 2012-02-20 | 1 | -1/+0 |
| * | Automatic merge | Michael Widenius | 2012-02-21 | 12 | -21/+71 |
| |\ | |||||
| | * | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 12 | -21/+71 |
| | |\ | |||||
| | | * | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 11 | -19/+66 |
| | | |\ | |||||
| | | | * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 11 | -19/+66 |
| | | | |\ | |||||
| | | | | * | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-12-15 | 5 | -3/+18 |
| | | | | |\ | |||||
| | | * | | | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check... | Michael Widenius | 2012-02-20 | 1 | -2/+5 |
| * | | | | | | BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, S... | Sergey Petrunya | 2012-02-20 | 1 | -1/+5 |
| |/ / / / / | |||||
| * | | | | | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 6 | -80/+8 |
| * | | | | | Counters for Index Condition Pushdown added (MDEV-130). | unknown | 2012-02-16 | 4 | -3/+23 |
* | | | | | | fix the include guards and add missing gplv2 headers | Sergei Golubchik | 2012-02-17 | 2 | -0/+32 |
* | | | | | | merge | Sergei Golubchik | 2012-02-15 | 2 | -25/+49 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 2 | -25/+49 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | 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 |
| | * | | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 2 | -8/+10 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | on windows: don't link all plugins with mysqld, only do it for storage engines. | Sergei Golubchik | 2011-12-29 | 1 | -1/+3 |
| | | * | | | | LPBUG#906638 : Fixes to build oqgraph with boost 1.48 | Vladislav Vaintroub | 2011-12-22 | 1 | -7/+7 |
| | | * | | | | compilation warning - unused variable | Sergei Golubchik | 2011-12-22 | 1 | -1/+1 |
| | * | | | | | Fix compiler warning on Windows. | Vladislav Vaintroub | 2012-01-19 | 1 | -0/+1 |
* | | | | | | | Fix wrong type causing build failure on windows. | unknown | 2012-02-15 | 2 | -2/+2 |
* | | | | | | | Fix wrong type causing build failure on windows. | unknown | 2012-02-15 | 1 | -1/+1 |
* | | | | | | | Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5. | unknown | 2012-02-15 | 45 | -988/+1100 |
|/ / / / / / | |||||
* | | | | | | Merge MySQL 5.5.20 into MariaDB 5.5. | unknown | 2012-02-14 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-12-15 | 3 | -2/+7 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merged bug#12361113. | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | merge | Mattias Jonsson | 2011-12-14 | 1 | -0/+3 |
| | * | | | | | | merge 5.1->5.1-security. | Georgi Kodinov | 2011-12-12 | 12 | -78/+137 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | auto-merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-11-04 | 2 | -1/+7 |
| | |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | | Various fixes for Solaris compiler. | Vladislav Vaintroub | 2012-02-03 | 2 | -3/+5 |
* | | | | | | | | | | MDEV-100 : innodb_plugin tests fail on Solaris. | Vladislav Vaintroub | 2012-02-02 | 2 | -1/+21 |
* | | | | | | | | | | remove building pbxt by default in any configuration (need explicit ./configu... | unknown | 2012-01-30 | 1 | -0/+5 |
* | | | | | | | | | | Fixed tests consumed big amount of disk space to be "BIG". | unknown | 2012-01-27 | 3 | -4/+18 |
* | | | | | | | | | | fix embedded build | Vladislav Vaintroub | 2012-01-26 | 1 | -0/+1 |
* | | | | | | | | | | Xtradb recently started to access thd members directly ,e.g thd->stmt_da (ha... | Vladislav Vaintroub | 2012-01-26 | 2 | -1/+2 |
* | | | | | | | | | | Always define UT_DBG_ABORT in innodb/xtradb, also on Windows. This will avoid... | Vladislav Vaintroub | 2012-01-25 | 2 | -10/+14 |
* | | | | | | | | | | Don't crash with: UPDATE performance_schema.setup_instruments SET ENABLED="NO"; | Michael Widenius | 2012-01-24 | 2 | -4/+17 |
* | | | | | | | | | | portability fixes for FreeBSD 8 and 9 | Vladislav Vaintroub | 2012-01-23 | 1 | -1/+1 |
* | | | | | | | | | | Fix innodb_bug60229 (get the innodb change into xtradb) | Vladislav Vaintroub | 2012-01-19 | 1 | -0/+5 |
* | | | | | | | | | | enable test cases for bugs fixed in xtradb. | Sergei Golubchik | 2012-01-16 | 2 | -2/+2 |
* | | | | | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 42 | -674/+822 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLES | Vasil Dimov | 2011-12-29 | 4 | -43/+55 |
| * | | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLES | Vasil Dimov | 2011-12-29 | 3 | -33/+76 |
| * | | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLES | Vasil Dimov | 2011-12-29 | 5 | -23/+45 |
| * | | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLES | Vasil Dimov | 2011-12-29 | 6 | -20/+70 |
| * | | | | | | | | | | Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLES | Vasil Dimov | 2011-12-29 | 1 | -1/+1 |
| * | | | | | | | | | | Merge mysql-5.1 to mysql-5.5. | Marko Mäkelä | 2011-12-28 | 7 | -140/+8 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Bug#13418934 REMOVE HAVE_PURIFY DEPENDENCES FROM INNODB | Marko Mäkelä | 2011-12-28 | 15 | -302/+16 |
| * | | | | | | | | | | | Auto-merge from mysql-5.1. | Ramil Kalimullin | 2011-12-23 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / |