Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -5/+1 |
|\ | |||||
| * | reduce code duplication a littlemariadb-5.5.54 | Sergei Golubchik | 2016-12-22 | 1 | -5/+1 |
* | | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 1 | -2/+0 |
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -1/+3 |
|\ \ | |/ | |||||
| * | small cleanup: udf_init()/udf_free() calls | Sergei Golubchik | 2015-12-08 | 1 | -1/+3 |
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -5/+13 |
|\ \ | |/ | |||||
| * | MDEV-5616 - Deadlock between CREATE/DROP FUNCTION and SELECT from view | Sergey Vojtovich | 2014-02-13 | 1 | -5/+13 |
* | | 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 | -2/+2 |
* | | Switch automaticly to statement based replication for statements that can't g... | Michael Widenius | 2012-09-04 | 1 | -44/+3 |
|/ | |||||
* | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+1 |
|\ | |||||
| * | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ | |||||
* | \ | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Bug #11754014: 45549: udf plugin_dir path separator inconsistency | Georgi Kodinov | 2012-01-16 | 1 | -3/+14 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | 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 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -10/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -10/+2 |
| | |\ \ \ | |||||
* | | \ \ \ | 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 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -10/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merging patch for BUG#58246 into mysql-5.5-bugteam. | Mats Kindahl | 2010-12-01 | 1 | -10/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | BUG#58246: INSTALL PLUGIN not secure & crashable | Mats Kindahl | 2010-12-01 | 1 | -10/+2 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -7/+13 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+7 |
| * | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -8/+26 |
| |\ \ \ | | |/ / | |||||
| * | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -2/+2 |
| |\ \ \ | |||||
| * | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -4/+4 |
* | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -2/+2 |
* | | | | | WL#5419 "LOCK_open scalability: make tdc_refresh_version | Konstantin Osipov | 2010-06-11 | 1 | -1/+1 |
* | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+7 |
* | | | | | Followup to Bug#45225 Locking: hang if drop table with no timeout | Jon Olav Hauglid | 2010-02-24 | 1 | -3/+3 |
* | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -10/+22 |
|\ \ \ \ \ | |||||
| * | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-10 | 1 | -0/+6 |
| * | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-09 | 1 | -10/+16 |
* | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -4/+22 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -2/+8 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -4/+12 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Manual merge with Conflicts: | unknown | 2010-01-25 | 1 | -4/+12 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -4/+4 |
| | | | | |/ / | | | | |/| | | |||||
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -4/+16 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Auto-merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -4/+14 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Bug #49132 Replication failure on temporary table + DDL | unknown | 2010-01-22 | 1 | -4/+14 |
| | | |/ / / | |||||
* | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / |