Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| * | | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -148/+156 |
| * | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -5/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -5/+3 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| | | |||||
| | | * | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -5/+3 |
| * | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -304/+59 |
|\ \ \ \ \ | | |_|/ / | |/| | | |