Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |\ | |||||
| | | * | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER | Rohit Kalhans | 2012-09-22 | 1 | -11/+24 |
* | | | | merge from 5.2 | unknown | 2012-08-24 | 1 | -29/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -29/+12 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -29/+12 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -1/+4 |
| | | |\ | |||||
| | | | * | Fixed Bug#11756013 (formerly known as bug#47870): | Dmitry Shulga | 2011-06-23 | 1 | -0/+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 |
* | | | | | merge | Sergei Golubchik | 2011-10-11 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed that when using a trigger mysql.proc is now accessed | Michael Widenius | 2011-10-06 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Rewritten patch of percona - switching query cache on and off, removing comme... | unknown | 2011-05-18 | 1 | -1/+1 |
* | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -8/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -8/+23 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed bug#54486 - assert in my_seek, concurrent | Dmitry Shulga | 2010-12-10 | 1 | -8/+23 |
* | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | Bug #46941 crash with lower_case_table_names=2 and foreign key | Magne Mahre | 2010-10-19 | 1 | -0/+6 |
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -0/+36 |
|\ \ \ | |/ / | |||||
| * | | Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER | Jon Olav Hauglid | 2010-06-26 | 1 | -0/+36 |
* | | | Fixes for Opensolaris (to get buildbot green) | Michael Widenius | 2010-06-23 | 1 | -6/+3 |
* | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -18/+33 |
|\ \ \ | |/ / | |||||
| * | | Fix for compiler warnings: | Davi Arnaut | 2010-01-28 | 1 | -1/+1 |
| * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -9/+26 |
| * | | Bug#49501 Inefficient information_schema check (system collation), addon | Sergey Glukhov | 2010-01-22 | 1 | -1/+1 |
| * | | Bug#49501 Inefficient information_schema check (system collation) | Sergey Glukhov | 2010-01-19 | 1 | -3/+2 |
| * | | Merge Bug#45520 fix from 5.0-bugteam | He Zhenxing | 2009-12-09 | 1 | -6/+5 |
| |\ \ | | |/ | |||||
| | * | BUG#45520 rpl_killed_ddl fails sporadically in pb2 | He Zhenxing | 2009-12-09 | 1 | -2/+3 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -10/+14 |
|\ \ \ | |/ / | |||||
| * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -9/+9 |
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -3/+3 |
| * | | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table | Sergey Glukhov | 2009-09-17 | 1 | -0/+4 |
* | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -4/+3 |
|\ \ \ | |/ / | |||||
| * | | BUG#45574 CREATE IF NOT EXISTS is not binlogged if the object exists | unknown | 2009-08-13 | 1 | -4/+3 |
* | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -15/+19 |
|\ \ \ | |/ / | |||||
| * | | Bug#44834 strxnmov is expected to behave as you'd expect | Sergey Glukhov | 2009-06-19 | 1 | -9/+9 |
| * | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -6/+9 |
| * | | Manually merge BUG#37145 to 5.1-bugteam | He Zhenxing | 2009-04-09 | 1 | -5/+6 |
| |\ \ | | |/ | |||||
| | * | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -4/+4 |
| | * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -9/+9 |
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -2/+0 |
| |\ \ | |||||
| * \ \ | Merging 5.1 main into 5.1-rpl | Mats Kindahl | 2008-10-23 | 1 | -4/+13 |
| |\ \ \ | |||||
| * \ \ \ | Merge 5.1 main -> 5.1-rpl | He Zhenxing | 2008-09-06 | 1 | -2/+7 |
| |\ \ \ \ | |||||
| * | | | | | Bug #38773: DROP DATABASE cause switch to stmt-mode when there are temporary ... | Mats Kindahl | 2008-08-20 | 1 | -8/+15 |