Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -1/+1 |
|\ | |||||
| * | increase upper value of max_prepared_stmt_count to UINT32_MAX | Daniel Black | 2018-04-03 | 1 | -1/+1 |
* | | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -1/+2 |
|\ \ | |||||
| * | | MariaDB adjustments. | Jan Lindström | 2017-10-19 | 1 | -0/+1 |
| * | | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -3/+9 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-5.5.47' into 5.5-galera | Nirbhay Choubey | 2015-12-10 | 1 | -1/+3 |
| |\ \ \ | |||||
| * | | | | cleanup: remove unused THD::COND_wsrep_thd | Nirbhay Choubey | 2015-02-19 | 1 | -1/+0 |
| * | | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge from maria/5.5 (-rtag:mariadb-5.5.36). | Nirbhay Choubey | 2014-02-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Merging revisions 3934..3944 from codership-mysql/5.5. | Nirbhay Choubey | 2014-02-03 | 1 | -4/+0 |
| * | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -2/+6 |
| * | | | | | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 | Seppo Jaakola | 2012-04-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -0/+17 |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galera | Sachin Setiya | 2017-05-30 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Change lower_case_file_system definition to feature MYSQL_PLUGIN_IMPORT | Vicențiu Ciorbaru | 2017-05-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segf... | Sergei Golubchik | 2017-05-15 | 1 | -0/+2 |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | MDEV-11221 - main.events_restart failed in bb | Sergey Vojtovich | 2017-03-01 | 1 | -1/+0 |
| * | | | | | | | | | | | | | Added a separate lock for start/stop/reset slave. | Monty | 2017-02-28 | 1 | -1/+1 |
| * | | | | | | | | | | | | | Windows : Fix server compile errors when compile with /Zc:strictStrings option | Vladislav Vaintroub | 2017-02-28 | 1 | -1/+2 |
* | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Cleanups and minor fixes | Monty | 2016-08-21 | 1 | -5/+0 |
| * | | | | | | | | | | | | | revert part of 69f1a32 | Sergei Golubchik | 2016-06-22 | 1 | -3/+3 |
| * | | | | | | | | | | | | | Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PL... | Vladislav Vaintroub | 2016-06-21 | 1 | -3/+3 |
* | | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -3/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-04-20 | 1 | -3/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Bug#21682356: STOP INJECTING DATA ITEMS IN AN ERROR MESSAGE | Knut Anders Hatlen | 2016-01-17 | 1 | -2/+8 |
* | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -3/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2015-12-09 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORK | Arun Kuruvila | 2015-09-22 | 1 | -1/+2 |
| | | * | | | | | | | | | | Bug#17873011 NO DEPRECATION WARNING FOR THREAD_CONCURRENCY | Arun Kuruvila | 2014-07-02 | 1 | -0/+1 |
| | | * | | | | | | | | | | Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, | Venkatesh Duggirala | 2014-05-08 | 1 | -2/+4 |
| | | * | | | | | | | | | | BUG#18054998 - BACKPORT FIX FOR BUG#11765785 to 5.5 | Thayumanavar | 2014-01-13 | 1 | -11/+1 |
| | | * | | | | | | | | | | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | | * | | | | | | | | | | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -0/+1 |
| | | * | | | | | | | | | | BUG#16196591 - CLIENTS CANNOT CONNECT TO MYSQL | Thayumanavar | 2013-02-05 | 1 | -0/+1 |
| | | * | | | | | | | | | | BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKET | Manish Kumar | 2012-06-12 | 1 | -0/+1 |
| | | * | | | | | | | | | | Revert two follow-ups for Bug#12762885: | Alexander Nozdrin | 2012-04-27 | 1 | -1/+0 |
| | | * | | | | | | | | | | Proper follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST" | Alexander Nozdrin | 2012-04-27 | 1 | -0/+1 |
| | | * | | | | | | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| | | * | | | | | | | | | | Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES AS | Dmitry Shulga | 2012-01-25 | 1 | -0/+1 |
| | | * | | | | | | | | | | BUG#11752315 - 43460: STOP SLAVE UNABLE TO COMPLETE WHEN SLAVE THREAD IS TRYI... | Manish Kumar | 2012-01-23 | 1 | -0/+4 |