Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 14 | -16/+33 |
|\ | |||||
| * | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 14 | -16/+33 |
| |\ | |||||
| | * | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 13 | -14/+26 |
| | |\ | |||||
| | | * | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 2 | -2/+2 |
| | | * | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files | Davi Arnaut | 2011-01-07 | 1 | -1/+3 |
| | | * | Bug#51023: Mysql server crashes on SIGHUP and destroys InnoDB files | Davi Arnaut | 2011-01-07 | 1 | -0/+1 |
| | | * | Merge | Kent Boortz | 2010-12-29 | 4 | -6/+6 |
| | | |\ | |||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 5 | -842/+7 |
| | | * | | Bug #58426 Crashing tests not failing as they are supposed to on Solaris 10 d... | Tor Didriksen | 2010-12-13 | 1 | -1/+2 |
| | | * | | Fix for bug#48451: my_seek and my_tell ignore MY_WME flag | Ramil Kalimullin | 2010-12-09 | 1 | -1/+2 |
| | | * | | Merging patch for BUG#58246 with mysql-5.1-bugteam. | Mats Kindahl | 2010-12-01 | 2 | -3/+3 |
| | | |\ \ | |||||
| | | | * | | Bug#51817: incorrect assumption: thd->query at 0x2ab2a8360360 is an invalid p... | Davi Arnaut | 2010-11-26 | 1 | -1/+1 |
| | | | * | | Bug#57994: Compiler flag change build error : my_redel.c | Davi Arnaut | 2010-11-20 | 1 | -1/+1 |
| | | | * | | Bug#57994: Compiler flag change build error : my_redel.c | Davi Arnaut | 2010-11-17 | 1 | -2/+2 |
| | | * | | | BUG#58246: INSTALL PLUGIN not secure & crashable | Mats Kindahl | 2010-12-01 | 4 | -0/+5 |
| | | |/ / | |||||
| | | * | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failure | Davi Arnaut | 2010-11-10 | 2 | -1/+8 |
| | | * | | Bug#57210: remove pstack | Davi Arnaut | 2010-11-09 | 1 | -1/+0 |
| | * | | | Merge with 5.1 | Michael Widenius | 2011-01-30 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Flush DBUG log in case of DBUG_ASSERT() | Michael Widenius | 2011-01-30 | 1 | -1/+1 |
| | * | | | | fixes for solaris 10 | Sergei Golubchik | 2011-01-26 | 1 | -0/+4 |
| | |/ / / | |||||
| | * | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -1/+2 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 2 | -1/+67 |
|/ / / / | |||||
* | | | | When compiling with valgrind, change my_alloca() to use my_malloc() | Michael Widenius | 2010-12-13 | 1 | -1/+1 |
* | | | | Automatic merge | Michael Widenius | 2010-12-04 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -3/+2 |
| |\ \ \ \ | | |/ / / | |||||
* | | | | | merge | Vladislav Vaintroub | 2010-12-02 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -1/+2 |
* | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 7 | -16/+102 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 3 | -8/+54 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -1/+12 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -1/+2 |
| | * | | Bug#52172 test binlog.binlog_index needs --skip-core-file to avoid leaving co... | Tor Didriksen | 2010-10-18 | 1 | -4/+47 |
| * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 3 | -4/+39 |
| |\ \ \ | | |/ / | |||||
| | * | | merge | Georgi Kodinov | 2010-10-05 | 1 | -2/+35 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #56428: Replace copyright notice removed from SHA1 code (.h) | Georgi Kodinov | 2010-10-05 | 1 | -2/+35 |
| | * | | Fixed bug #47485 - mysql_store_result returns a not NULL result set | Dmitry Shulga | 2010-09-07 | 2 | -2/+4 |
* | | | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 4 | -4/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 4 | -4/+15 |
* | | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 2 | -7/+16 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 2 | -7/+16 |
* | | | | merge w/ 5.1 | Sergei Golubchik | 2010-10-29 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
* | | | | sane implementation of Key_% status variables. | Sergei Golubchik | 2010-10-29 | 1 | -12/+0 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -2/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#55846: Link tests fail on Windows - my_compiler.h missing | Davi Arnaut | 2010-08-24 | 1 | -2/+3 |
| | * | | Bug #42144: plugin_load fails | Georgi Kodinov | 2010-08-04 | 1 | -1/+1 |
| | * | | Bug #42144: plugin_load fails | Georgi Kodinov | 2010-08-03 | 1 | -1/+1 |
* | | | | Automatic merge with 5.1 | Michael Widenius | 2010-10-06 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix for Bug#43152 "Assertion `bitmap_is_set_all(&table->s->all_set)' failed i... | Michael Widenius | 2010-10-06 | 1 | -2/+2 |
* | | | | fixes for gcc 4.5 | Sergei Golubchik | 2010-09-28 | 5 | -5/+6 |