Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+1 |
|\ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -17/+4 |
* | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -3/+4 |
|/ | |||||
* | Asserting correct database name lettercase in | Sergei Golubchik | 2014-05-01 | 1 | -0/+2 |
* | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -0/+11 |
|\ | |||||
| * | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -0/+11 |
| |\ | |||||
| | * | Flush the proc file after every modifications. This will avoid errors of type... | Michael Widenius | 2013-10-15 | 1 | -0/+11 |
* | | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -23/+27 |
|\ \ \ | |/ / | |||||
| * | | support DEFINER=role and DEFINER=current_role | Sergei Golubchik | 2013-10-18 | 1 | -7/+12 |
| * | | cleanup | Sergei Golubchik | 2013-10-18 | 1 | -19/+18 |
| |/ | |||||
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -13/+13 |
|\ \ | |||||
| * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -13/+13 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | MDEV-4332 Increase username length from 16 characters | Sergei Golubchik | 2013-04-18 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-04-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Fixed compiler warnings and a not critical memory leak | Michael Widenius | 2013-04-17 | 1 | -1/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -3/+13 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -3/+13 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -3/+13 |
| | |\ | |||||
| | | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -3/+14 |
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-10-17 | 1 | -1/+0 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -33/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Switch automaticly to statement based replication for statements that can't g... | Michael Widenius | 2012-09-04 | 1 | -33/+0 |
| |/ / | |||||
| * | | Split ER_NO_SUCH_TABLE into ER_NO_SUCH_TABLE and ER_NO_SUCH_TABLE_IN_ENGINE t... | Michael Widenius | 2012-08-28 | 1 | -0/+1 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -3/+3 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+45 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+45 |
| | |\ \ | |||||
| | | * \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+42 |
| | | |\ \ | |||||
| | * | | | | Fixed bug discovered by testcase for LP#618558 (original bug seams to be fixe... | Michael Widenius | 2010-11-15 | 1 | -1/+1 |
* | | | | | | Fix valgrind error after 5.5 merge (the 5.3 fix was accidentally lost in the ... | unknown | 2011-12-08 | 1 | -1/+1 |
* | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -19/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed that when using a trigger mysql.proc is now accessed | Michael Widenius | 2011-10-06 | 1 | -18/+27 |
| * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
* | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -10/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -10/+9 |
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+51 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -2/+50 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Manual merge of patch for bug#11756013 from mysql-5.1 tree. | Dmitry Shulga | 2011-06-24 | 1 | -1/+48 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Fixed Bug#11756013 (formerly known as bug#47870): | Dmitry Shulga | 2011-06-23 | 1 | -1/+41 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | | Bug #45287: phase 2 : 5.0 64 bit compilation warnings | Georgi Kodinov | 2009-07-16 | 1 | -3/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -2/+2 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -1/+1 |