Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -0/+3 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -0/+3 |
| | |\ | |||||
| | | * | MDEV-12761 Error return from external_lock make the server crash | Sergei Golubchik | 2017-05-15 | 1 | -0/+3 |
* | | | | MDEV-10139 Support for SEQUENCE objects | Monty | 2017-04-07 | 1 | -6/+9 |
|/ / / | |||||
* | | | MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLES | Sergey Vojtovich | 2016-12-21 | 1 | -7/+1 |
* | | | cleanup: unused open_table_from_share() flags | Sergei Golubchik | 2016-12-12 | 1 | -1/+0 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -7/+51 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-08-25 | 1 | -7/+51 |
| |\ \ | |||||
| | * | | Refs MW-252 | sjaakola | 2016-08-21 | 1 | -3/+6 |
| | * | | Refs: MW-252 | sjaakola | 2016-08-21 | 1 | -8/+11 |
| | * | | Refs MW-252 | sjaakola | 2016-08-21 | 1 | -3/+3 |
| | * | | Refs MW-252 | sjaakola | 2016-08-21 | 1 | -5/+1 |
| | * | | Refs MW-252 | sjaakola | 2016-08-21 | 1 | -1/+40 |
| | * | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -1/+0 |
| | |\ \ | | | |/ | |||||
| | * | | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -4/+5 |
| | |\ \ | |||||
| | * \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -4/+1 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -1/+8 |
| | * | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -12/+12 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+45 |
* | | | | | | | | | MDEV-8931: (server part of) session state tracking | Oleksandr Byelkin | 2016-08-31 | 1 | -0/+37 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -1/+0 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | MDEV-8453 Alter table not returning engine errors | Sergei Golubchik | 2015-11-16 | 1 | -34/+3 |
* | | | | | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -2/+2 |
* | | | | | | | MDEV-7945 - THD::enter_stage() takes 0.48% in OLTP RO | Sergey Vojtovich | 2015-05-13 | 1 | -2/+2 |
* | | | | | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -4/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Return to original stage after mysql_lock_tables | Michael Widenius | 2015-01-18 | 1 | -4/+5 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | MDEV-7004 - Merge scalability fixes from 10.0-power | Sergey Vojtovich | 2014-12-05 | 1 | -6/+14 |
* | | | | | | MDEV-7004 - Merge scalability fixes from 10.0-power | Sergey Vojtovich | 2014-12-05 | 1 | -16/+15 |
* | | | | | | 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 |
| | |_|_|/ | |/| | | | |||||
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+46 |
|/ / / / | |||||
* | | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -0/+2 |
|\ \ \ \ | |||||
| * | | | | Added new states to be able to better diagnose where server hangs. | Michael Widenius | 2014-05-03 | 1 | -1/+1 |
* | | | | | Asserting correct database name lettercase in | Sergei Golubchik | 2014-05-01 | 1 | -0/+2 |
| |_|_|/ |/| | | | |||||
* | | | | MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables | Sergey Vojtovich | 2014-03-20 | 1 | -4/+1 |
| |_|/ |/| | | |||||
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -12/+12 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix test errors like: | Sergey Petrunya | 2013-07-08 | 1 | -10/+8 |
| * | | ha_partition.cc and ha_partition.h are now completely merged | Michael Widenius | 2013-06-27 | 1 | -11/+12 |
| * | | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -1/+0 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -10/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 1 | -10/+8 |
| |/ | |||||
* | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -5/+4 |
|/ | |||||
* | MDEV-254: Server hang with FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT | unknown | 2012-05-08 | 1 | -0/+9 |
* | Cleanups: | Michael Widenius | 2012-03-20 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -5/+9 |
|\ | |||||
| * | Merge with 5.1 & fixes to IGNORE handling | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ |