Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -26/+14 |
|\ | |||||
| * | MDEV-11221 - main.events_restart failed in bb | Sergey Vojtovich | 2017-03-01 | 1 | -26/+14 |
* | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-09-01 | 1 | -1/+1 |
* | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 1 | -0/+5 |
* | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 1 | -1/+1 |
|/ | |||||
* | 5.5.40+ merge | Sergei Golubchik | 2014-10-09 | 1 | -8/+1 |
|\ | |||||
| * | MDEV-6774 - Deadlock between SELECT, DROP TABLE, SHOW STATUS and | Sergey Vojtovich | 2014-09-25 | 1 | -8/+1 |
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -20/+46 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -20/+46 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -31/+43 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16865959 - PLEASE BACKPORT BUG 14749800. | Praveenkumar Hulakund | 2013-07-24 | 1 | -31/+49 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+4 |
|\ \ \ \ | |||||
| * | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -3/+4 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -20/+6 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Speed up connection time: | Michael Widenius | 2013-03-20 | 1 | -20/+6 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -8/+9 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -7/+8 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -1/+0 |
| |/ / | |||||
| * | | Added new status variables: | Michael Widenius | 2012-09-09 | 1 | -2/+3 |
* | | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -0/+2 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -14/+15 |
* | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+2 |
|/ / | |||||
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -1/+1 |
* | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+9 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | Make event stop code even more robust. | Michael Widenius | 2011-05-09 | 1 | -1/+8 |
| | * | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| * | | | | Merge. | Igor Babaev | 2010-12-10 | 1 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | Merge 5.3-mwl128 -> 5.3 | Igor Babaev | 2010-10-27 | 1 | -0/+0 |
| | |/ / / | |||||
| * | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -0/+8 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| * | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+5 |
| |\ \ | |||||
| * \ \ | Merge with base MySQL-5.1-maria | Michael Widenius | 2008-12-03 | 1 | -13/+0 |
| |\ \ \ | |||||
| * | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -0/+8 |
* | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -1/+1 |
* | | | | | | Unset the execute bit where it's not needed. | Davi Arnaut | 2010-07-03 | 1 | -0/+0 |
|/ / / / / | |||||
* | | | | | A pre-requisite for WL#5419 "LOCK_open scalability: | Konstantin Osipov | 2010-06-10 | 1 | -1/+0 |