summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.5' into 10.0Sergei Golubchik2018-04-201-2/+2
|\
| * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-04-191-2/+7
| |\
| | * BUG#24365972 BINLOG DECODING ISN'T RESILIENT TO CORRUPT BINLOG FILESJoao Gramacho2018-02-021-1/+6
| | * Bug#17873011 NO DEPRECATION WARNING FOR THREAD_CONCURRENCYArun Kuruvila2014-07-021-1/+28
| | * BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-211-9/+0
| | * BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-121-0/+44
| | * Merge from mysql-5.5.14-releasehery.ramilison@oracle.com2011-07-061-7/+0
| | |\
| | | * merge 5.1 => 5.5 : Bug#12329653Tor Didriksen2011-05-051-7/+0
| | * | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | |/
| | * 5.1-bugteam->5.5-bugteam mergeSergey Glukhov2010-12-141-4/+29
| | * Bug#57604 Reserve bit in option_bits for slave_allow_batching featureMagnus Blåudd2010-10-201-0/+6
| | * Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-2/+0
| | |\
| | | * WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-2/+0
| | * | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-0/+10
| | |/
| | * Bug#20837 Apparent change of isolation level during transactionMagne Mahre2010-06-081-0/+5
| | |\
| | | * Draft patch that fixes and a sketches test cases for:Konstantin Osipov2010-05-071-0/+5
| | * | Backport: Remove unused and ancient files, functions, and facilities.Davi Arnaut2010-05-281-4/+0
| | |/
| | * Committing on behalf or Dmitry Lenev:Konstantin Osipov2010-04-281-0/+6
| | * WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-3/+3
| | * WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+265
* | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2017-06-201-1/+1
|\ \ | |/
| * cleanup: remove duplicate codeSergei Golubchik2017-06-141-1/+1
* | 5.5.40+ mergeSergei Golubchik2014-10-091-6/+29
|\ \ | |/
| * mysql-5.5.40Sergei Golubchik2014-10-061-2/+29
| |\
| | * Bug#17873011 NO DEPRECATION WARNING FOR THREAD_CONCURRENCYArun Kuruvila2014-07-021-1/+28
| | * BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-211-9/+0
| | * BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKSNuno Carvalho2012-10-121-0/+44
* | | cleanup: an outbreak of templatonia cured.Sergei Golubchik2014-09-301-35/+0
* | | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+4
* | | MDEV-6047: Make exists_to_in optimization ON by defaultunknown2014-06-091-1/+2
* | | 10.0-base mergeSergei Golubchik2014-02-261-0/+1
|\ \ \
| * | | MDEV-5244: Make extended_keys=ON by default in 10.0Sergey Petrunya2014-02-251-0/+1
* | | | Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-051-0/+2
* | | | 10.0-monty mergeSergei Golubchik2013-07-211-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+1
* | | | Merge 10.0-base->mwl253 Igor Babaev2013-04-121-4/+4
|\ \ \ \
| * | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-071-4/+4
* | | | | The pilot patch for mwl#253.Igor Babaev2013-03-111-0/+1
|/ / / /
* | | | [NOT] EXISTS to IN transformation.unknown2013-02-261-1/+1
|/ / /
* | | 5.5 mergeSergei Golubchik2013-01-291-0/+35
|\ \ \ | |/ /
| * | 5.3 mergeSergei Golubchik2013-01-151-0/+35
* | | Merge maria-5.5-mwl248 -> 10.0-base.Igor Babaev2012-12-161-0/+1
|\ \ \
| * \ \ Merge 5.5 -> 5.5-mwl248.Igor Babaev2012-11-021-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248.Igor Babaev2012-03-191-0/+1
* | | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-161-0/+2
|\ \ \ \ | |/ / /
| * | | 5.3 mergeSergei Golubchik2012-10-181-0/+2
| |/ /
* | | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5Sergey Petrunya2012-05-161-0/+1
|/ /
* | MergeIgor Babaev2012-03-021-0/+1
|\ \
| * | Merge MWL#234: @@skip_replication feature to MariaDB 5.5.unknown2012-03-011-0/+1
* | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5.Igor Babaev2012-03-021-1/+2
|/ /