Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2018-02-04 | 1 | -1/+1 |
|\ | |||||
| * | Added name to MEM_ROOT for esier debugging | Monty | 2018-02-02 | 1 | -1/+1 |
* | | Change C_STRING_WITH_LEN to STRING_WITH_LEN | Monty | 2018-01-30 | 1 | -4/+4 |
* | | Changed database, tablename and alias to be LEX_CSTRING | Monty | 2018-01-30 | 1 | -8/+8 |
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -10/+24 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-18 | 1 | -8/+22 |
| |\ | |||||
| | * | MW-416 DDL replication moved after acl checking | sjaakola | 2017-10-10 | 1 | -8/+22 |
| * | | MDEV-14013 : sql_mode=EMPTY_STRING_IS_NULL | halfspawn | 2017-10-14 | 1 | -2/+2 |
* | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -3/+3 |
| |\ \ | | |/ | |||||
| | * | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
| | * | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -2/+2 |
* | | | Lots of small cleanups | Michael Widenius | 2017-08-24 | 1 | -2/+2 |
* | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / | |||||
* | | MDEV-13298 Change sp_head::m_chistics from a pointer to a structure | Alexander Barkov | 2017-07-12 | 1 | -1/+7 |
* | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -26/+27 |
|/ | |||||
* | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -1/+1 |
* | MDEV-8001 - mysql_reset_thd_for_next_command() takes 0.04% in OLTP RO | Sergey Vojtovich | 2015-05-13 | 1 | -1/+1 |
* | Fix compilation warnings in -DWITH_WSREP=OFF build. | Kristian Nielsen | 2015-05-11 | 1 | -0/+2 |
* | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -9/+1 |
* | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+17 |
|/ | |||||
* | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
|\ | |||||
| * | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -1/+1 |
| |\ | |||||
| | * | MDEV-4824 userstats - wrong user statistics | Sergei Golubchik | 2013-11-11 | 1 | -1/+1 |
* | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
| * | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
| |/ | |||||
* | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -2/+4 |
* | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+4 |
|/ | |||||
* | 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 |
| | | |\ | |||||
* | | | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+5 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -2/+2 |
| * | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | | | |||||
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -3/+3 |
| | | |/ / | | |/| | | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -46/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteam | Jon Olav Hauglid | 2010-11-18 | 1 | -45/+0 |
| |\ \ \ \ | |||||
| | * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -45/+0 |
| * | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well. | Alexander Barkov | 2010-11-18 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -4/+2 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+7 |
| |\ \ \ | | | |/ | | |/| |