Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged the fix for bug lp:944706, mdev-193 | unknown | 2012-06-19 | 1 | -1/+1 |
|\ | |||||
| * | Fix for bug lp:944706, task MDEV-193 | unknown | 2012-05-17 | 1 | -1/+1 |
* | | fix an overly agressive optimization in Item_func_conv_charset | Sergei Golubchik | 2012-06-17 | 1 | -4/+20 |
* | | MDEV-316 lp:1009085 Assertion failed: warn_item, file item_cmpfunc.cc, line 3613 | Sergei Golubchik | 2012-06-15 | 1 | -0/+8 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-03-06 | 1 | -1/+1 |
|\ | |||||
| * | Fix for LP BUG#944504 | unknown | 2012-03-05 | 1 | -1/+1 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+3 |
| | | | |\ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | |\ \ | |||||
| | | | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -1/+1 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+78 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 1 | -0/+68 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fixed all reported bugs for dynamic columns. | Michael Widenius | 2011-05-11 | 1 | -1/+1 |
| | * | | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 1 | -0/+68 |
| * | | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -2/+21 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -2/+21 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -6/+63 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merging from mysql-5.1 | Alexander Barkov | 2011-03-03 | 1 | -2/+3 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Bug 11766519 - 59648: MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FA... | Alexander Barkov | 2011-03-03 | 1 | -2/+3 |
| | | |_|/ / | | |/| | | | |||||
| * | | | | | Bug#31384 DATE_ADD() and DATE_SUB() return binary data | Alexander Barkov | 2011-02-10 | 1 | -2/+5 |
| * | | | | | Bug #59632 Assertion failed: arg_length > length | Tor Didriksen | 2011-02-07 | 1 | -2/+4 |
| * | | | | | Merging from 5.1. | Alexander Barkov | 2011-01-17 | 1 | -0/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string ... | Alexander Barkov | 2011-01-17 | 1 | -0/+1 |
| * | | | | | Merge of fix for Bug#58165. | Martin Hansson | 2011-01-13 | 1 | -0/+10 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Bug#58165: "my_empty_string" gets modified and causes LOAD DATA to fail and | Martin Hansson | 2011-01-13 | 1 | -0/+10 |
| * | | | | | Bug#57737 Character sets: search fails with like, contraction, index | Alexander Barkov | 2010-11-26 | 1 | -0/+40 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -2/+19 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -1/+12 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+12 |
| | |\ \ \ | |||||
| * | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+17 |
| |/ / / / | |||||
| * | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -5/+14 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -6/+6 |
| |\ \ \ \ \ | |||||
| * | | | | | | Windows fixes | unknown | 2008-01-10 | 1 | -2/+2 |
* | | | | | | | Bug#55912 FORMAT with locale set fails for numbers < 1000 | Alexander Barkov | 2010-08-20 | 1 | -4/+4 |
* | | | | | | | Bug#45263 utf32_general_ci, bad effects around CREATE TABLE AS SELECT | Alexander Barkov | 2010-08-18 | 1 | -4/+4 |
* | | | | | | | Bug#54661 sha2() returns BINARY result | Alexander Barkov | 2010-07-07 | 1 | -8/+5 |
* | | | | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-04-27 | 1 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Backport of: | Konstantin Osipov | 2010-04-13 | 1 | -0/+12 |
* | | | | | | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -0/+4 |
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | fixed compiler warning | Sergey Glukhov | 2010-03-29 | 1 | -1/+1 |
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-02 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Bug#52164 Assertion failed: param.sort_length, file .\filesort.cc, line 149 | Sergey Glukhov | 2010-03-26 | 1 | -1/+2 |
| | |_|_|/ / | |/| | | | |