summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-131-4/+9
|\
| * Rewrite IGNORE handling:Michael Widenius2011-12-111-4/+9
| * Merge with 5.2.Michael Widenius2011-12-111-60/+163
| |\
| | * Merge with 5.1Michael Widenius2011-11-301-3/+3
| | |\
| | | * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-3/+3
| | * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-2/+3
| | |\ \ | | | |/
| | * | after merge fixesSergei Golubchik2011-11-281-2/+8
| | * | Merge with MariaDB 5.1Michael Widenius2011-11-241-55/+151
| | |\ \ | | | |/
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-52/+152
| | | |\
| | | | * Merge.Sergey Vojtovich2011-08-241-42/+141
| | | | |\
| | | | | * BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILDSergey Vojtovich2011-08-181-42/+141
* | | | | | moved ha_maria::implicit_commit() calls aroundSergei Golubchik2012-01-061-5/+0
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-271-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed LP bug #892725.Igor Babaev2011-11-201-0/+2
* | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-10/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix MySQL BUG#12329653unknown2011-11-121-2/+2
| * | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-2/+2
| * | | | | BUG#849763: Wrong result with second execution of prepared statement with sem...Sergey Petrunya2011-09-201-1/+15
| * | | | | Merge with 5.2Michael Widenius2011-09-101-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-2/+2
| * | | | | Merge of mergeunknown2011-09-021-2/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge 5.2->5.3unknown2011-09-021-2/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ...Michael Widenius2011-09-021-2/+3
| * | | | | | BUG#834534: Assertion `0' failed in replace_where_subcondition with semijoin ...Sergey Petrunya2011-08-291-5/+2
| |/ / / / /
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-4/+81
|\ \ \ \ \ \
| * \ \ \ \ \ 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-4/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-4/+4
| * | | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-0/+77
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-167/+309
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Fixed LP bug #825035.Igor Babaev2011-08-161-0/+1
| * | | | | | Fixed LP BUG#800696.unknown2011-07-191-5/+0
| * | | | | | Merge with the latest 5.3 code.Igor Babaev2011-07-111-3/+12
| |\ \ \ \ \ \
| | * | | | | | Fixed LP bug #794890.Igor Babaev2011-06-131-3/+12
| * | | | | | | Fixed LP bug #793386.Igor Babaev2011-07-111-0/+5
| * | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-2/+2
| * | | | | | | Fixed a valgrind problem.Igor Babaev2011-06-231-3/+10
| * | | | | | | Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-69/+153
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-69/+153
| | |\ \ \ \ \ \
| | | * | | | | | Fix of privilege problem in views and PSOleksandr Byelkin2011-06-021-1/+1
| | | * | | | | | MergeIgor Babaev2011-05-201-61/+141
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-61/+141
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-61/+138
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-61/+138
| * | | | | | | | | | | Fixed that SHOW COLUMNS for a virtual persistent column shows 'PERSISTENT' in...Michael Widenius2011-06-061-4/+0
| |/ / / / / / / / / /
| * | | | | | | | | | Merge 5.3->main -> 5.3-mwl90Sergey Petrunya2011-05-291-5/+25
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Update pbxt suite test resultsSergey Petrunya2011-05-291-1/+1
| | * | | | | | | | | - Update test results (trivial)Sergey Petrunya2011-05-291-22/+0
| | * | | | | | | | | Buildbot fixes:Sergey Petrunya2011-05-291-2/+4
| | * | | | | | | | | post-merge fixes: get MWL#90 code to work with MWL#89'sSergey Petrunya2011-05-281-4/+32
| | * | | | | | | | | Merge MWL#90 with 5.3-mainSergey Petrunya2011-05-251-1/+13
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |