Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -10/+12 |
|\ | |||||
| * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -10/+12 |
| |\ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -9/+11 |
| | |\ | |||||
| | | * | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -7/+6 |
| | | * | auto-merge | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -0/+2 |
| | | |\ | |||||
| | | * \ | auto-merge Bug#11762799/Bug#55436 | Tatjana Azundris Nuernberg | 2011-05-12 | 1 | -3/+3 |
| | | |\ \ | |||||
| | | | * \ | auto-merge conservative fix for Bug#55436/Bug#11762799 | Tatiana Azundris Nurnberg | 2011-05-05 | 1 | -3/+3 |
| | | | |\ \ | |||||
| | | | | * | | Bug#55436: buffer overflow in debug binary of dbug_buff in Field_new_decimal:... | Tatiana A. Nurnberg | 2010-11-11 | 1 | -3/+3 |
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | * | | | | automerge | Georgi Kodinov | 2011-01-07 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | * | | | | | backport: Bug #55568 from 5.1-security to 5.0-security | Gleb Shchepa | 2010-11-23 | 1 | -1/+1 |
* | | | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Bug#11766270 59343: YEAR(4): INCORRECT RESULT AND VALGRIND WARNINGS WITH MIN/... | Sergey Glukhov | 2011-04-12 | 1 | -0/+2 |
| | |/ / / / / | |||||
| | * | | | | | Fix for bug #58650 "Failing assertion: primary_key_no == -1 || | Dmitry Lenev | 2011-02-02 | 1 | -0/+1 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| | | |/ / | |||||
* | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#55531 crash with conversions of geometry types / strings | Kristofer Pettersson | 2010-09-07 | 1 | -1/+1 |
| | * | | | Bug #55568: user variable assignments crash server when used | Alexey Kopytov | 2010-08-24 | 1 | -1/+1 |
| | | |/ | | |/| | |||||
* | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -9/+8 |
|\ \ \ \ | |||||
| * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -7/+7 |
| * | | | | Fix usage of mysqld option --new, --old, --safe and --skip_new to not disable... | Michael Widenius | 2010-09-23 | 1 | -2/+1 |
* | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+7 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -2/+0 |
| | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-09 | 1 | -5/+5 |
| | * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -1/+7 |
* | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -14/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -14/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#53942 valgrind warnings with timestamp() function and incomplete datetime... | Sergey Glukhov | 2010-05-31 | 1 | -14/+1 |
* | | | | Fixed bug #607566. | Igor Babaev | 2010-07-19 | 1 | -1/+1 |
* | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -40/+59 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.47 | Michael Widenius | 2010-05-26 | 1 | -3/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for bug#50946: fast index creation still seems to copy the table | Ramil Kalimullin | 2010-04-25 | 1 | -3/+9 |
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -37/+50 |
| |\ \ \ | | |/ / | |||||
| | * | | Merging with mysql-5.1-bugteam | Mats Kindahl | 2010-03-17 | 1 | -19/+34 |
| | |\ \ | |||||
| | | * | | BUG#49618: Field length stored incorrectly in binary log | Mats Kindahl | 2010-03-17 | 1 | -19/+34 |
| | * | | | Bug #49829 Many "hides virtual function" warnings with | Staale Smedseng | 2010-03-14 | 1 | -12/+11 |
| | * | | | Bug#45195 valgrind warnings about uninitialized values in store_record_in_cac... | Sergey Glukhov | 2010-02-10 | 1 | -6/+5 |
* | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -9/+25 |
* | | | | | Fixed bug #539643. | Igor Babaev | 2010-03-16 | 1 | -3/+1 |
* | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -2/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -2/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug #31145: ALTER TABLE DROP COLUMN, ADD COLUMN crashes (linux) or | Georgi Kodinov | 2009-12-18 | 1 | -2/+1 |