| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'mariadb-10.0.32' into 10.0-galera | Jan Lindström | 2017-08-09 | 1 | -34/+3 |
| |\ | |||||
| | * | MDEV-8453 Alter table not returning engine errors | Sergei Golubchik | 2017-08-01 | 1 | -34/+3 |
| * | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -0/+3 |
| |\ \ | |/ | |||||
| | * | MDEV-12761 Error return from external_lock make the server crash | Sergei Golubchik | 2017-05-15 | 1 | -0/+3 |
| * | | 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 |
| |\ \ | |/ | |||||
| | * | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -1/+0 |
| * | | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -4/+5 |
| |\ \ | |/ | |||||
| | * | Return to original stage after mysql_lock_tables | Michael Widenius | 2015-01-18 | 1 | -4/+5 |
| * | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
| * | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+3 |
| |\ \ | |/ | |||||
| | * | 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 |
| * | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -4/+1 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tables | Sergey Vojtovich | 2014-03-20 | 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 |
| |\ \ \ | |/ / | |||||
| | * | | 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 |
| * | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+45 |
| |/ / / | |||||
| * | | | 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 |
| | |\ | |||||
| | | * | 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 |
| | | | | |\ | |||||
| | * | | | | | BUG#868908: Crash in check_simple_equality() with semijoin + materialization ... | Sergey Petrunya | 2011-12-07 | 1 | -3/+7 |
| | |/ / / / | |||||
| * | | | | | Fix crash due to wrong my_error() call (5.5 after-merge fix). | unknown | 2011-12-05 | 1 | -1/+1 |
| * | | | | | 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 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| * | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -60/+65 |
| |\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -1/+27 |
| | * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+3 |
| | | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -0/+3 |
| | | * | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |