Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+36 |
|\ | |||||
| * | Bug#13359121 LARGE NUMBERS, /STRINGS/DTOA.C:662 | Tor Didriksen | 2012-01-25 | 1 | -0/+36 |
* | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | merge mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-10-12 | 1 | -0/+35 |
| |\ | |||||
| * | | Bug#11764310 - 57132: CONV FUNCTION CRASHES, NEGATIVE ARGUMENT TO MEMCPY | Kristofer Pettersson | 2011-09-15 | 1 | -1/+1 |
| * | | Bug11764310 - 57132: CONV FUNCTION CRASHES, NEGATIVE ARGUMENT TO MEMCPY | Kristofer Pettersson | 2011-09-06 | 1 | -0/+6 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | Set new default values for the optimizer switch flags 'derived_merge' | Igor Babaev | 2011-11-26 | 1 | -0/+3 |
* | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -1/+0 |
|\ \ \ \ | |/ / / | |||||
* | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -0/+35 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORY | Tor Didriksen | 2011-09-26 | 1 | -2/+2 |
| * | | | Bug#12985030 SIMPLE QUERY WITH DECIMAL NUMBERS LEAKS MEMORY | Tor Didriksen | 2011-09-20 | 1 | -0/+35 |
| | |/ | |/| | |||||
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -127/+128 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Made the optimizer switches 'derived_merge' and 'derived_with_keys' | Igor Babaev | 2011-07-21 | 1 | -4/+6 |
| * | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -6/+4 |
| |\ | |||||
| | * | Merge | Igor Babaev | 2011-05-20 | 1 | -6/+4 |
| | |\ | |||||
| | | * | Fixed LP bug #784848 that caused failures of func_str.test and | Igor Babaev | 2011-05-18 | 1 | -0/+12 |
| | | * | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -18/+4 |
| | | |\ | |||||
| | | | * | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -6/+4 |
| | | | |\ | |||||
| | | | | * | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -6/+4 |
| * | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e... | Michael Widenius | 2011-05-21 | 1 | -125/+125 |
| |/ / / / | |||||
| * | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -125/+125 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with main 5.3 | Michael Widenius | 2011-05-08 | 1 | -125/+125 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -125/+125 |
| | |/ / / | |||||
| * | | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+16 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+12 |
| |\ \ \ \ | |||||
| * | | | | | MWL#128: Added into EXPLAIN output info about types of the used join buffers and | Igor Babaev | 2010-10-18 | 1 | -2/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge of fix for Bug#58165. | Martin Hansson | 2011-01-13 | 1 | -0/+16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail and | Martin Hansson | 2011-01-13 | 1 | -0/+16 |
| | |/ / | |/| | | |||||
* | | | | 5.1-bugteam->5.5-bugteam merge(test case only) | Sergey Glukhov | 2010-12-14 | 1 | -0/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug#57818 string conversion function died | Sergey Glukhov | 2010-12-14 | 1 | -0/+12 |
| |/ / | |||||
* | | | Bug#55912 FORMAT with locale set fails for numbers < 1000 | Alexander Barkov | 2010-08-20 | 1 | -0/+25 |
* | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-02 | 1 | -0/+14 |
|\ \ \ | |/ / | |||||
| * | | Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149 | Sergey Glukhov | 2010-03-26 | 1 | -0/+14 |
* | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | WL#2649 Number-to-string conversions | Alexander Barkov | 2010-02-11 | 1 | -4/+4 |
| * | | | Backport of WL #2934: Make/find library for doing float/double | Alexey Kopytov | 2009-12-22 | 1 | -2/+2 |
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-07 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Bug#47669 Query showed by EXPLAIN EXTENDED gives different result from origin... | Sergey Glukhov | 2010-02-26 | 1 | -2/+2 |
| |/ | |||||
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -0/+29 |
|\ \ | |/ | |||||
| * | Bug#49141: Encode function is significantly slower in 5.1 compared to 5.0 | Davi Arnaut | 2009-12-04 | 1 | -0/+29 |
* | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -0/+130 |
|\ \ | |||||
| * | | Fix test results after the latest merge. | Alexander Nozdrin | 2009-10-14 | 1 | -2/+2 |
| * | | WL#4584 Internationalized number format | Alexander Barkov | 2009-10-05 | 1 | -0/+130 |
* | | | This is a backport of the two patches for Bug #28299: | Staale Smedseng | 2009-10-09 | 1 | -0/+3 |
|/ / | |||||
* | | Merge mysql-next-mr --> mysql-trunk-signal | Marc Alff | 2009-09-17 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-09-10 | 1 | -0/+9 |
| |\ | |||||
| | * | Bug#46815 CONCAT_WS returning wrong data | Sergey Glukhov | 2009-09-10 | 1 | -0/+9 |
* | | | WL#2110 (SIGNAL) | Marc Alff | 2009-09-10 | 1 | -128/+128 |
|/ / | |||||
* | | Auto-merge. | Ramil Kalimullin | 2009-05-13 | 1 | -0/+9 |
|\ \ | |/ |