summaryrefslogtreecommitdiff
path: root/sql/mysqld.h
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.35' into 10.0-galeraJan Lindström2018-05-071-1/+1
|\
| * increase upper value of max_prepared_stmt_count to UINT32_MAXDaniel Black2018-04-031-1/+1
* | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-071-1/+2
|\ \
| * | MariaDB adjustments.Jan Lindström2017-10-191-0/+1
| * | Merge tag 'mariadb-5.5.49' into 5.5-galeraNirbhay Choubey2016-04-251-3/+9
| |\ \
| * \ \ Merge tag 'mariadb-5.5.47' into 5.5-galeraNirbhay Choubey2015-12-101-1/+3
| |\ \ \
| * | | | cleanup: remove unused THD::COND_wsrep_thdNirbhay Choubey2015-02-191-1/+0
| * | | | bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-0/+1
| |\ \ \ \
| * \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-1/+1
| |\ \ \ \ \ \
| * | | | | | | Merging revisions 3934..3944 from codership-mysql/5.5.Nirbhay Choubey2014-02-031-4/+0
| * | | | | | | Merging revision 3839..3932 from codership-mysql/5.5.Nirbhay Choubey2014-01-091-2/+6
| * | | | | | | Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-1/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mariadb-5.5.33 mergeSergei Golubchik2013-09-181-1/+0
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-4/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-0/+17
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.31' into 10.0-galeraSachin Setiya2017-05-301-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Change lower_case_file_system definition to feature MYSQL_PLUGIN_IMPORTVicențiu Ciorbaru2017-05-171-1/+1
| * | | | | | | | | | | | | MDEV-12420 max_recursive_iterations did not prevent a stack-overflow and segf...Sergei Golubchik2017-05-151-0/+2
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | MDEV-11221 - main.events_restart failed in bbSergey Vojtovich2017-03-011-1/+0
| * | | | | | | | | | | | | Added a separate lock for start/stop/reset slave.Monty2017-02-281-1/+1
| * | | | | | | | | | | | | Windows : Fix server compile errors when compile with /Zc:strictStrings optionVladislav Vaintroub2017-02-281-1/+2
* | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Cleanups and minor fixesMonty2016-08-211-5/+0
| * | | | | | | | | | | | | revert part of 69f1a32Sergei Golubchik2016-06-221-3/+3
| * | | | | | | | | | | | | Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PL...Vladislav Vaintroub2016-06-211-3/+3
* | | | | | | | | | | | | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-3/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-3/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Bug#21682356: STOP INJECTING DATA ITEMS IN AN ERROR MESSAGEKnut Anders Hatlen2016-01-171-2/+8
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2015-12-091-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | Bug #21370329 : FLUSH DES_KEY_FILE MAY NOT WORKArun Kuruvila2015-09-221-1/+2
| | | * | | | | | | | | | Bug#17873011 NO DEPRECATION WARNING FOR THREAD_CONCURRENCYArun Kuruvila2014-07-021-0/+1
| | | * | | | | | | | | | Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS,Venkatesh Duggirala2014-05-081-2/+4
| | | * | | | | | | | | | BUG#18054998 - BACKPORT FIX FOR BUG#11765785 to 5.5Thayumanavar2014-01-131-11/+1
| | | * | | | | | | | | | Updated/added copyright headersMurthy Narkedimilli2014-01-061-1/+1
| | | * | | | | | | | | | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7Ashish Agarwal2013-07-021-0/+1
| | | * | | | | | | | | | BUG#16196591 - CLIENTS CANNOT CONNECT TO MYSQLThayumanavar2013-02-051-0/+1
| | | * | | | | | | | | | BUG#12400221 - 60926: BINARY LOG EVENTS LARGER THAN MAX_ALLOWED_PACKETManish Kumar2012-06-121-0/+1
| | | * | | | | | | | | | Revert two follow-ups for Bug#12762885:Alexander Nozdrin2012-04-271-1/+0
| | | * | | | | | | | | | Proper follow-up for Bug#12762885 - 61713: MYSQL WILL NOT BIND TO "LOCALHOST"Alexander Nozdrin2012-04-271-0/+1
| | | * | | | | | | | | | Updated/added copyright headersMySQL Build Team2012-02-161-1/+1
| | | * | | | | | | | | | Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES ASDmitry Shulga2012-01-251-0/+1
| | | * | | | | | | | | | BUG#11752315 - 43460: STOP SLAVE UNABLE TO COMPLETE WHEN SLAVE THREAD IS TRYI...Manish Kumar2012-01-231-0/+4