Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 21 | -164/+390 |
|\ | |||||
| * | Automatic merge with 5.2 | Michael Widenius | 2011-08-16 | 1 | -0/+3 |
| |\ | |||||
| | * | If mysqld --log-warnings=3 or higher, then print all check and repair warning... | Michael Widenius | 2011-08-16 | 1 | -0/+3 |
| * | | Valgrind fix for the previous cset: | Sergey Petrunya | 2011-07-15 | 1 | -0/+1 |
| * | | BUG#778434 Wrong result with in_to_exists=on in maria-5.3-mwl89 | Sergey Petrunya | 2011-07-14 | 1 | -1/+7 |
| * | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -4/+4 |
| |\ \ | |||||
| | * | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -4/+4 |
| * | | | Merge 5.2 -> 5.3 | Sergey Petrunya | 2011-06-24 | 2 | -34/+39 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed several errors in Aria discovered by test case for lp:727869 ma_pagecac... | Michael Widenius | 2011-06-24 | 2 | -34/+39 |
| | |/ | |||||
| * | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge | Igor Babaev | 2011-05-20 | 1 | -0/+3 |
| | |\ \ | |||||
| | | * \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -0/+3 |
| | | |\ \ | |||||
| * | | \ \ | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -0/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -0/+2 |
| * | | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 8 | -12/+11 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| | | |||||
| | * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 8 | -12/+11 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 8 | -12/+11 |
| | | |\ \ \ | |||||
| * | | | | | | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 2 | -1/+9 |
| * | | | | | | merge mwl#55 | Vladislav Vaintroub | 2011-03-11 | 1 | -13/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 5 | -9/+18 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -13/+4 |
| * | | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 5 | -6/+15 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 5 | -6/+15 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 4 | -4/+13 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Fixes for Aria storage engine: | Michael Widenius | 2011-02-10 | 1 | -1/+1 |
| | | * | | | | | | Aria issues: | Michael Widenius | 2011-01-24 | 1 | -1/+1 |
| | * | | | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | | * | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -3/+3 |
| * | | | | | | | | MRR interface: change range_info's type from char* to range_id_t typedef. The... | Sergey Petrunya | 2011-03-04 | 2 | -2/+2 |
| * | | | | | | | | Merge in new handler and handlersocket code into 5.3 main | Michael Widenius | 2011-02-22 | 2 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge with 5.1 | Michael Widenius | 2011-01-11 | 2 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | |||||
| | | * | | | | | | | virtual columns: | Sergei Golubchik | 2010-12-31 | 2 | -1/+1 |
| * | | | | | | | | | Linker error, missing extern "C" for mi_killed. | Vladislav Vaintroub | 2011-02-18 | 1 | -3/+5 |
| * | | | | | | | | | Merge with bugfix | Michael Widenius | 2011-02-18 | 10 | -48/+176 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 10 | -48/+172 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | compilation failures caused by adding new row format to Aria | Sergei Golubchik | 2011-01-14 | 1 | -9/+9 |
| * | | | | | | | | | use bulk insert and repair by sort for unique keys in | Sergei Golubchik | 2011-01-14 | 1 | -1/+9 |
| * | | | | | | | | | BUG#665669: Result differences on query re-execution | Sergey Petrunya | 2011-01-12 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge DS-MRR/CPK improvements into 5.3-main | Sergey Petrunya | 2010-12-13 | 2 | -4/+5 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge MWL#121-125 DS-MRR improvements into MWL#128 Classic hash join tree | Sergey Petrunya | 2010-11-15 | 2 | -4/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | MWL#121-124 DS-MRR support for key-ordered retrieval, etc | Sergey Petrunya | 2010-11-01 | 2 | -4/+5 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | MWL#121: DS-MRR support for clustered primary keys | Sergey Petrunya | 2010-07-16 | 2 | -4/+5 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | |||||
| | | | | * | | | | | | | MWL#121: DS-MRR support for clustered primary keys | Sergey Petrunya | 2010-06-22 | 2 | -4/+3 |
| | | | | * | | | | | | | MWL#121: DS-MRR support for clustered primary keys | Sergey Petrunya | 2010-06-19 | 2 | -7/+9 |
| * | | | | | | | | | | | merge LP Bug#686184 | Vladislav Vaintroub | 2010-12-07 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | merge LP Bug#686184 | Vladislav Vaintroub | 2010-12-07 | 2 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Fix myisam_crash_before_flush_keys on Windows | Vladislav Vaintroub | 2010-12-07 | 1 | -1/+1 |
| | | * | | | | | | | | | Fix LP Bug#686184 - merge_debug test fails. | Vladislav Vaintroub | 2010-12-06 | 1 | -1/+1 |
| * | | | | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / |