Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+32 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+34 |
| |\ | |||||
| | * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fixed compiler warnings and other bugs found by buildbot. | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+33 |
| | |\ \ | | | |/ | |||||
| | | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -2/+33 |
| | | |\ | |||||
| | | | * | manual merge | Tatjana Azundris Nuernberg | 2011-10-06 | 1 | -9/+10 |
| | | | |\ | |||||
| | | | | * | additional clean-up for 11765687 | Tatjana Azundris Nuernberg | 2011-10-06 | 1 | -9/+10 |
| | | | * | | manual merge | Tatjana Azundris Nuernberg | 2011-09-29 | 1 | -2/+32 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Bug#11765687 (MySQL58677): No privilege on table / view, but can know #rows /... | Tatjana Azundris Nuernberg | 2011-09-29 | 1 | -2/+32 |
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | Fixed LP BUG#747278 | unknown | 2011-11-28 | 1 | -0/+2 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed that when using a trigger mysql.proc is now accessed | Michael Widenius | 2011-10-06 | 1 | -1/+1 |
* | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -71/+27 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fix for LP BUG#806071 | unknown | 2011-07-21 | 1 | -1/+15 |
| * | | | | | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -66/+8 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -66/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -66/+8 |
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -16/+30 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -16/+30 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| * | | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -26/+33 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bug#11764503 (Bug#57341) Query in EXPLAIN EXTENDED shows wrong characters | Alexander Barkov | 2011-03-04 | 1 | -1/+2 |
| * | | | | | | | weave merge from mysql-5.1 to mysql-5.5 | Georgi Kodinov | 2011-02-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Updating header copyright/README in source for 2011 | Karen Langford | 2011-01-25 | 1 | -1/+1 |
| * | | | | | | | Merged fix for bug #58499 "DEFINER-security view selecting from | Dmitry Lenev | 2011-01-12 | 1 | -14/+28 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fix for bug #58499 "DEFINER-security view selecting from | Dmitry Lenev | 2011-01-12 | 1 | -14/+28 |
| * | | | | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -1/+1 |
| * | | | | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -9/+1 |
* | | | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -1/+1 |
| * | | | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -7/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | |||||
| | * | | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -7/+7 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -3/+4 |
| | | |\ \ \ | |||||
| * | | \ \ \ | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -8/+37 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -8/+37 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -1/+3 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge from mysql-5.5-bugfixing to mysql-5.5-runtime | Jon Olav Hauglid | 2010-08-18 | 1 | -2/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -2/+0 |
* | | | | | | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". | Konstantin Osipov | 2010-08-09 | 1 | -15/+5 |
|/ / / / / / | |||||
* | | | | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE | Jon Olav Hauglid | 2010-07-01 | 1 | -3/+4 |
* | | | | | | Merge trunk-bugfixing -> trunk-runtime | Konstantin Osipov | 2010-06-17 | 1 | -7/+7 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 1 | -3/+4 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -3/+4 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | | | |_|/ / | | | |/| | | |