Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -5/+9 |
|\ | |||||
| * | Merge 5.3 -> 5.5 | Alexander Barkov | 2014-01-27 | 1 | -5/+7 |
| |\ | |||||
| | * | MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(...): | Alexander Barkov | 2014-01-27 | 1 | -5/+7 |
| * | | Merge 5.3->5.5 | Alexander Barkov | 2013-11-21 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | MDEV-4859 Wrong value and data type of "SELECT MAX(time_column) + 1 FROM t1" | Alexander Barkov | 2013-11-21 | 1 | -0/+2 |
* | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -14/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.3-5.5 | Igor Babaev | 2013-10-13 | 1 | -0/+10 |
| |\ \ | | |/ | |||||
| | * | Fixed bug mdev-5105. | Igor Babaev | 2013-10-10 | 1 | -0/+10 |
| * | | merge 5.3 -> 5.5 | unknown | 2013-09-25 | 1 | -14/+11 |
| |\ \ | | |/ | |||||
| | * | MDEV-5039: incorrect Item_func_regex::update_used_tables() | unknown | 2013-09-25 | 1 | -14/+11 |
* | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -41/+205 |
|\ \ \ | |/ / | |||||
| * | | Merge from 5.3 | Alexander Barkov | 2013-09-10 | 1 | -41/+198 |
| |\ \ | | |/ | |||||
| | * | MDEV-4863 COALESCE(time_or_datetime) returns wrong results in numeric context | Alexander Barkov | 2013-09-09 | 1 | -41/+197 |
| * | | Merge from 5.3 | Alexander Barkov | 2013-08-12 | 1 | -0/+7 |
| |\ \ | | |/ | |||||
| | * | MDEV-4652 Wrong result for CONCAT(GREATEST(TIME('00:00:01'),TIME('00:00:00')) | Alexander Barkov | 2013-08-12 | 1 | -0/+7 |
* | | | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -3/+17 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -0/+7 |
| |\ \ | |||||
| | * \ | Bug#16073689 : CRASH IN ITEM_FUNC_MATCH::INIT_SEARCH | Neeraj Bisht | 2013-04-20 | 1 | -0/+14 |
| | |\ \ | |||||
| | | * | | Bug#16073689 : CRASH IN ITEM_FUNC_MATCH::INIT_SEARCH | Neeraj Bisht | 2013-04-20 | 1 | -0/+14 |
| * | | | | Merging from 5.3 | Alexander Barkov | 2013-07-08 | 1 | -3/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | MDEV-4667 DATE('string') incompability between mysql and mariadb | Sergei Golubchik | 2013-07-03 | 1 | -3/+3 |
| * | | | | Merge from 5.3 | Alexander Barkov | 2013-06-28 | 1 | -0/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-4634 Crash in CONVERT_TZ | Alexander Barkov | 2013-06-28 | 1 | -0/+6 |
* | | | | | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -18/+31 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -3/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY | Gleb Shchepa | 2013-01-31 | 1 | -2/+2 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY | Gleb Shchepa | 2013-01-31 | 1 | -2/+2 |
| | | |\ \ | |||||
| | | | * | | Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY | Gleb Shchepa | 2013-01-23 | 1 | -2/+2 |
| | * | | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -2/+2 |
| | | |/ / | |||||
| | * | | | Bug#14466617 - INVALID WRITES AND/OR CRASH WITH USER | Praveenkumar Hulakund | 2012-11-07 | 1 | -8/+21 |
| | * | | | Bug#11745891 - LAST_INSERT(ID) DOES NOT SUPPORT BIGINT UNSIGNED | Neeraj Bisht | 2012-10-16 | 1 | -1/+2 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | 5.3 merge | Sergei Golubchik | 2013-04-12 | 1 | -14/+15 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | MDEV-4316 MariaDB server crash with signal 11 | Sergei Golubchik | 2013-04-06 | 1 | -14/+15 |
| * | | | | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -1/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-4283 Assertion `scale <= precision' fails in strings/decimal.c | Sergei Golubchik | 2013-03-18 | 1 | -1/+3 |
| * | | | | Fix clang warning (suggest parentheses) | Vladislav Vaintroub | 2013-03-12 | 1 | -0/+2 |
| * | | | | MDEV-4224 : func_math test fails, when clang 3.0 compiler is used. | Vladislav Vaintroub | 2013-03-12 | 1 | -0/+8 |
* | | | | | References: MDEV-4572 - merge with mariaDB 5.5.30 | Seppo Jaakola | 2013-05-24 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.3->5.5 merge | Sergei Golubchik | 2013-02-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.2 -> 5.3 | Sergei Golubchik | 2013-02-28 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | 5.1 -> 5.2 merge | Sergei Golubchik | 2013-02-28 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | a simpler fix for | Sergei Golubchik | 2013-02-28 | 1 | -1/+1 |
* | | | | | | | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -13/+30 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -0/+13 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-3900 Optimizer difference between MySQL and MariaDB with stored function... | unknown | 2013-01-17 | 1 | -0/+13 |
| * | | | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -13/+17 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -2/+3 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -2/+3 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| |