summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* merge with MySQL 5.5.27Sergei Golubchik2012-08-091-5/+134
|\
| * bug#11759333:Rohit Kalhans2012-07-101-16/+10
| * BUG#11759333: SBR LOGGING WARNING MESSAGES FOR PRIMARYRohit Kalhans2012-07-101-5/+139
| * Bug#14003080:65104: MAX_USER_CONNECTIONS WITH PROCESSLIST EMPTYPraveenkumar Hulakund2012-05-281-1/+85
* | mysql-5.5 mergeSergei Golubchik2012-06-141-3/+10
|\ \ | |/
| * Merge 5.5.24 back into main 5.5.Joerg Bruehe2012-05-071-8/+37
| |\
| * \ merge bug11754117-45670 fixes from 5.1.Andrei Elkin2012-04-211-1/+7
| |\ \
| | * | BUG#11754117 incorrect logging of INSERT into auto-increment Andrei Elkin2012-04-201-1/+7
* | | | cSergei Golubchik2012-05-211-7/+36
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug #12408412: GROUP_CONCAT + ORDER BY + INPUT/OUTPUT SAME Georgi Kodinov2012-03-091-7/+36
| |/ /
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-281-2/+2
|\ \ \ | |/ /
| * | Merged from mysql-5.1-security Gopal Shankar2012-01-301-2/+2
| |\ \ | | |/
| | * Bug#13105873 :Valgrind Warning: CRASH IN FOREIGNGopal Shankar2012-01-301-2/+2
* | | mdev-201 - Assertion `!thd->spcont' failed in net_send_error on server shutdownSergei Golubchik2012-03-271-0/+3
* | | Merged the implementation of MDEV-28 LIMIT ROWS EXAMINED into MariaDB 5.5.unknown2012-03-121-6/+23
|\ \ \
| * | | Implementation of MDEV-28 LIMIT ROWS EXAMINEDunknown2012-03-111-6/+23
* | | | Merge 5.3->5.5.Igor Babaev2012-03-011-0/+6
|\ \ \ \ | |/ / /
| * | | Fixed LP bug #939009.Igor Babaev2012-02-241-0/+6
* | | | Update copyright noticesVladislav Vaintroub2012-02-281-1/+1
* | | | Simplify thd_wait_begin. given how seldom they are called, calling current_th...Vladislav Vaintroub2012-02-171-13/+7
* | | | address second round review commentsVladislav Vaintroub2012-02-161-9/+21
* | | | Threadpool : Rest of monty's reviewVladislav Vaintroub2012-01-271-1/+1
* | | | Further review points and simplify Windows implementationVladislav Vaintroub2012-01-261-0/+2
* | | | further reduce diffs to 5.5, monty reviewVladislav Vaintroub2012-01-241-5/+1
* | | | mergeVladislav Vaintroub2012-01-241-32/+8
|\ \ \ \
| * \ \ \ mysql-5.5 mergeSergei Golubchik2012-01-161-0/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#13437900 - VALGRIND REPORTS A LEAK FOR REPL_IGNORE_SERVER_IDSAndrei Elkin2011-12-141-0/+5
| * | | | 5.3 mergeSergei Golubchik2012-01-131-32/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Rewrite IGNORE handling:Michael Widenius2011-12-111-11/+2
| | * | | Merge with 5.2.Michael Widenius2011-12-111-5/+26
| | |\ \ \
| | | * \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-5/+26
| | | |\ \ \
| | | | * \ \ Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-5/+26
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
* | | | | | | Fix crashes in windows-embeddedVladislav Vaintroub2012-01-021-1/+1
* | | | | | | LP909537: Ensure thd_wait_begin/thd_wait_end callbacks are called.Vladislav Vaintroub2011-12-291-17/+9
* | | | | | | fix embedded build and warningVladislav Vaintroub2011-12-271-1/+1
* | | | | | | Small adjustements to threadpoolVladislav Vaintroub2011-12-181-0/+1
* | | | | | | Fix Unix buildVladislav Vaintroub2011-12-101-0/+2
* | | | | | | Initial threadpool implementation for MariaDB 5.5Vladislav Vaintroub2011-12-081-29/+8
|/ / / / / /
* | | | | | small cleanupSergei Golubchik2011-11-281-9/+1
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-31/+88
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-4/+37
| * | | | | Merge with 5.2Michael Widenius2011-09-101-1/+13
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-1/+13
| * | | | | Merge 5.2->5.3unknown2011-09-021-25/+37
| |\ \ \ \ \ | | |/ / / /
| | * | | | LP BUG#823169 fix.unknown2011-09-021-24/+36
| | * | | | Added logging of all messages (also system warnings) one gets during a MyISAM...Michael Widenius2011-08-291-1/+1
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-18/+27
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Backporting fix from trunk (revid 3381), original comment:Bjorn Munch2011-08-241-1/+1
| * | | | | Cherry-picking patch for 12777649 from mysql-5.5Alexander Nozdrin2011-08-151-2/+2
| * | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-1/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |