summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
* | | | | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-1/+0
| | * | | | Updated/added copyright headersKent Boortz2011-07-031-4/+23
| | |\ \ \ \
| | | * \ \ \ merge from latest 5.1Guilhem Bichot2011-05-211-0/+19
| | | |\ \ \ \
| | | | * | | | Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDEDMayank Prasad2011-05-181-0/+19
| | * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \ \ \
| | | * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| * | | | | | | | Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL DIRNAME_LEN...Tor Didriksen2011-07-201-3/+3
| * | | | | | | | Updated/added copyright headersKent Boortz2011-07-041-11/+21
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for bug #12641342 - "61401: UPDATE PERFORMANCE DEGRADESDmitry Lenev2011-06-161-9/+17
| |/ / / / / / / /
* | | | | | | | | bugfix: progress reporting and sub-statementsSergei Golubchik2011-10-191-5/+12
* | | | | | | | | safe_mutex deadlock detector post-merge fixesSergei Golubchik2011-10-191-0/+5
* | | | | | | | | Id column in EXPLAIN can be null.Sergei Golubchik2011-10-191-1/+2
* | | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-50/+252
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Automatic merge with 5.2Michael Widenius2011-08-161-0/+5
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Fixed bug that MAX_USER_CONNECTIONS was not working properly in all situation...Michael Widenius2011-08-161-0/+5
| * | | | | | | | Merge with the latest 5.3 code.Igor Babaev2011-07-111-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed LP bug #794890.Igor Babaev2011-06-131-0/+1
| * | | | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-0/+119
| * | | | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-0/+2
| * | | | | | | | | Fixed LP bug #798576.Igor Babaev2011-06-241-0/+1
| * | | | | | | | | Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-1/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-1/+3
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ MergeIgor Babaev2011-05-201-1/+3
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-1/+3
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-1/+3
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-1/+3
| * | | | | | | | | | | | | Merge with 5.2Michael Widenius2011-06-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | / / / / / / / | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Fixed problem that global status variables 'bytes_recieved' and 'binlog_bytes...Michael Widenius2011-06-091-2/+2
| * | | | | | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | post review changes 2Sergei Golubchik2011-05-191-1/+2
| | * | | | | | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-4/+4
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge with 5.3 mainMichael Widenius2011-05-161-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | MWL#89unknown2011-05-021-0/+2
| | |\ \ \ \ \ \ \ \ \ \