Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 1 | -2/+0 |
|\ | |||||
| * | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 13 | -33/+282 |
| |\ | |||||
| * | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -2/+0 |
* | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 13 | -33/+278 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 13 | -33/+278 |
| |\ \ | |||||
| | * | | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing | Michael Widenius | 2011-02-25 | 1 | -2/+2 |
| | * | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed... | Michael Widenius | 2011-02-24 | 4 | -12/+18 |
| | * | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 8 | -18/+253 |
| | |\ \ | |||||
| | | * | | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 2 | -2/+2 |
| | | * | | Bug#42054: SELECT CURDATE() is returning bad value | Davi Arnaut | 2011-01-11 | 1 | -1/+7 |
| | | * | | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files | Davi Arnaut | 2011-01-07 | 1 | -3/+3 |
| | | * | | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files | Davi Arnaut | 2011-01-07 | 1 | -1/+134 |
| | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 12 | -1312/+2 |
| | | * | | | Fix for bug#48451: my_seek and my_tell ignore MY_WME flag | Ramil Kalimullin | 2010-12-09 | 3 | -5/+13 |
| | | * | | | Workaround a GCC warning about a pointer being cast to a larger | Davi Arnaut | 2010-11-30 | 1 | -1/+4 |
| | | * | | | Bug#51817: incorrect assumption: thd->query at 0x2ab2a8360360 is an invalid p... | Davi Arnaut | 2010-11-26 | 1 | -7/+96 |
| | | * | | | merge | Georgi Kodinov | 2010-11-26 | 1 | -1/+16 |
| | | |\ \ \ | |||||
| | | * | | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 2 | -6/+7 |
| | | * | | | | Bug #45288 pb2 returns a lot of compilation warnings | Jon Olav Hauglid | 2010-11-08 | 1 | -1/+3 |
| | * | | | | | fix "./configure --with-debug" builds | Sergei Golubchik | 2011-01-26 | 1 | -1/+1 |
| | * | | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -2/+6 |
| * | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Fixed compiler warnings and some test failures found by buildbot | Michael Widenius | 2011-02-23 | 1 | -8/+11 |
* | | | | | | | Merge in new handler and handlersocket code into 5.3 main | Michael Widenius | 2011-02-22 | 3 | -11/+30 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge with 5.1 | Michael Widenius | 2011-01-11 | 2 | -6/+8 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Automatic merge with 5.1 | Michael Widenius | 2011-01-10 | 1 | -0/+4 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | - Fixed that Aria works with HANDLER commands | Michael Widenius | 2011-01-10 | 1 | -0/+4 |
| * | | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 2 | -11/+26 |
* | | | | | | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 1 | -2/+2 |
* | | | | | | | | Fix compile errors: | Vladislav Vaintroub | 2011-02-01 | 1 | -1/+2 |
* | | | | | | | | Removed some old comments. | Sergei Golubchik | 2011-01-14 | 1 | -1/+1 |
* | | | | | | | | Merge | Igor Babaev | 2010-12-27 | 2 | -6/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge: mwl#24+mwl#21 5.1->5.2 | Igor Babaev | 2010-12-24 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Merge | Igor Babaev | 2010-12-09 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge | Igor Babaev | 2010-09-27 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | An implementation of index intersect via a modified Unique class. | Igor Babaev | 2010-09-13 | 1 | -0/+2 |
| * | | | | | | | | | merge with 5.1 | Michael Widenius | 2010-12-13 | 1 | -6/+4 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Fixed typo that caused compile failure in thr_lock.c | Michael Widenius | 2010-12-13 | 1 | -1/+1 |
| | * | | | | | | | | Better warning message if lock test fails | Michael Widenius | 2010-12-10 | 1 | -6/+4 |
| | |/ / / / / / / | |||||
* | | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+0 |
* | | | | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 11 | -59/+121 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 8 | -45/+84 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Fixed some compiler warnings | Michael Widenius | 2010-11-30 | 1 | -0/+2 |
| | * | | | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 5 | -31/+38 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | merge to 5.1-security | Georgi Kodinov | 2010-10-29 | 4 | -30/+46 |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | | * | | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 2 | -21/+15 |
| | | | * | | | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-19 | 1 | -1/+1 |