Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+5 |
|\ | |||||
| * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+5 |
| |\ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -6/+8 |
| | |\ | |||||
| | | * | BUG#12695969 | Luis Soares | 2011-07-12 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | BUG#12695969 | Luis Soares | 2011-07-12 | 1 | -1/+1 |
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | | | |\ | |||||
| | | | | * | Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0 | Magne Mahre | 2011-03-22 | 1 | -1/+1 |
| | | | |/ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+2 |
| | | |\ \ | |||||
| | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -3/+3 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
* | | | | | | Fixed compilation & test issues found by buildbot | Michael Widenius | 2011-07-02 | 1 | -1/+1 |
* | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+1 |
* | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+1 |
* | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -1/+1 |
| | |/ / | |||||
* | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+2 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -2/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -3/+3 |
* | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 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 |
* | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -5/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -4/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-07-14 | 1 | -1/+1 |
| | * | | Bug#22320: my_atomic-t unit test fails | Davi Arnaut | 2010-07-05 | 1 | -4/+2 |
| | * | | reverting a bogus fix into 5.1-bugteam | Georgi Kodinov | 2009-03-20 | 1 | -3/+5 |
| | * | | Copy include/config.h to include/my_config.h at configure-time. Also, | Chad MILLER | 2009-03-19 | 1 | -5/+3 |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added macros to inform valgrind that memory is uninitialized | Michael Widenius | 2010-05-26 | 1 | -1/+1 |
* | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+3 |
* | | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 1 | -2/+3 |
|/ / / | |||||
* | | | Apply patch by Antony Dovgal: | Michael Widenius | 2009-03-22 | 1 | -0/+2 |
* | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -5/+8 |
|\ \ \ | |/ / | |||||
| * | | Bug#39571 abi_check Does not create all prerequisites | V Narayanan | 2008-10-27 | 1 | -5/+8 |
* | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -16/+3 |
|\ \ \ | |/ / | |||||
| * | | WL#4380 | Narayanan V | 2008-07-18 | 1 | -0/+2 |
| * | | WL#4380 | Thava Alagu | 2008-07-09 | 1 | -14/+0 |
| |\ \ | |||||
| | * | | Removed the references to mysql_h.ic in include/Makefile.am | Narayanan V | 2008-06-18 | 1 | -14/+0 |
| * | | | Bug#37003 Tests sporadically crashes with embedded server | Davi Arnaut | 2008-06-18 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2008-02-08 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -1/+1 |
* | | | | fixes for make distcheck | Sergei Golubchik | 2008-08-29 | 1 | -1/+2 |
* | | | | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2008-02-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Post merge fix for BUG 33728 | unknown | 2008-01-11 | 1 | -1/+1 |
| |/ / | |||||
* | | | Windows fixes | unknown | 2008-01-10 | 1 | -1/+1 |
* | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | |