summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* 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
* cleanup: remove duplicate codeSergei Golubchik2017-06-141-1/+1
* 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
* | 5.3 mergeSergei Golubchik2013-01-151-0/+35
* | 5.3 mergeSergei Golubchik2012-10-181-0/+2
* | 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
|/ /
* | 5.3 mergeSergei Golubchik2012-01-131-1/+5
* | 5.3->5.5 mergeSergei Golubchik2011-11-271-5/+2
* | 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+5
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-9/+2
|\ \ | |/
| * Merge from mysql-5.5.14-releaseunknown2011-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
| |/
* | merge with 5.3Sergei Golubchik2011-10-191-30/+70
* | 5.5-mergeSergei Golubchik2011-07-021-4/+35
|\ \ | |/
| * 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.Sergei Golubchik2010-11-251-13/+33
|/
* 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