Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 13 | -33/+282 |
|\ | |||||
| * | 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 |
| |\ \ \ \ \ | |||||
| | * | | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -0/+4 |
* | | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -2/+0 |
|/ / / / / / | |||||
* | | | | | | 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 |
* | | | | | | 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 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 | 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 |
| | | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-10-19 | 2 | -8/+30 |
| | * | | | | Bug#57359 Possible to circumvent secure_file_priv using '..' on Windows | Kristofer Pettersson | 2010-10-17 | 1 | -1/+16 |
| | |/ / / | |||||
| * | | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 2 | -14/+44 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge | Georgi Kodinov | 2010-10-05 | 1 | -12/+43 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Bug #56427 : Replace copyright notice removed from SHA1 code | Georgi Kodinov | 2010-10-05 | 1 | -12/+43 |
| | | * | | Bug #51893: crash with certain characters given to load_file | Georgi Kodinov | 2010-03-30 | 1 | -0/+3 |
| | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-09-24 | 1 | -2/+1 |
* | | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 3 | -14/+37 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 2 | -6/+12 |
| * | | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -8/+25 |
* | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 3 | -61/+152 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler & valgrind warnings from my previous push. | Michael Widenius | 2010-11-03 | 1 | -0/+1 |
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 3 | -61/+151 |
* | | | | merge w/ 5.1 | Sergei Golubchik | 2010-10-29 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
* | | | | sane implementation of Key_% status variables. | Sergei Golubchik | 2010-10-29 | 1 | -159/+0 |