summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Added reporting of fsync to THD wait interfaceMikael Ronstrom2010-10-283-3/+6
| * | | | | | Added more comments to THD wait serviceMikael Ronstrom2010-10-271-0/+13
| * | | | | | Added more wait states for THD wait serviceMikael Ronstrom2010-10-273-9/+27
| | |_|/ / / | |/| | | |
* | | | | | lots of post-merge changesSergei Golubchik2011-04-256-31/+92
* | | | | | merge.Sergei Golubchik2010-11-257-8/+669
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | fixes for gcc 4.5Sergei Golubchik2010-09-285-5/+6
| * | | | Rename control file and log files from maria_xxx to aria_xxx when upgrading f...Michael Widenius2010-09-271-3/+3
| * | | | provide maria* aliases for aria* command-line options,Sergei Golubchik2010-09-141-2/+2
| * | | | plugin maturity is unsignedSergei Golubchik2010-06-152-2/+2
| * | | | merge 5.1->5.2Sergei Golubchik2010-06-012-19/+29
| |\ \ \ \
| | * \ \ \ Merge with MySQL 5.1.47Michael Widenius2010-05-262-16/+26
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-3/+3
| | |\ \ \ \
| * | | | | | Maria WL#61unknown2010-04-012-0/+71
| * | | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-296-1/+427
| * | | | | | mwl:98 - libservicesSergei Golubchik2010-03-035-70/+293
| * | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-062-2/+2
| |/ / / / /
| * | | | | Fixes after comments from last push:Michael Widenius2009-11-302-10/+14
| * | | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-302-4/+4
| * | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-3/+13
| |\ \ \ \ \
| * \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+140
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-0/+10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge xiphis.org:/anubis/antony/work/p1-bug34598.2unknown2008-02-191-1/+1
| |\ \ \ \ \ \ \ \
| * | | | | | | | | after mergeunknown2007-12-281-1/+4
* | | | | | | | | | Fix for Bug#54478 "mysqld crashes during boot when running mtr with --debug o...Olav Sandstaa2010-09-151-1/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-304-45/+272
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge fix for BUG52821 to 5.5-bugfixing.Sergey Vojtovich2010-08-272-46/+242
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#52821 - plugin_ftparser.h and plugin_audit.h areSergey Vojtovich2010-08-272-46/+242
| * | | | | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-182-0/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge mysql-5.5-bugfixing -> mysql-5.5-innodbVasil Dimov2010-08-183-3/+5
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Fix bug #53496 Use Lock_time in slow query log output for InnoDB rowJimmy Yang2010-08-172-0/+2
| * | | | | | | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-08-111-0/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merging with mysql-5.5-stage.Mats Kindahl2010-08-165-1/+172
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | WL#5363: Thread Pool Service InterfaceMats Kindahl2010-06-075-1/+172
* | | | | | | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-203-3/+5
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Bug#55087 Performance schema: optimization of the instrumentation interfaceMarc Alff2010-07-095-99/+443
* | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* | | | | | | | | Fixed headers in include/mysql/psiMarc Alff2010-07-085-15/+15
* | | | | | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-302-16/+26
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | BUG#39053 - UNISTALL PLUGIN does not allow the storage engineSergey Vojtovich2010-04-142-16/+26
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merging with mysql-trunk-bugfixingMats Kindahl2010-04-211-3/+4
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge fixes for BUG46587 and BUG47059 to trunk-bugfixing.Sergey Vojtovich2010-04-151-3/+4
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#47059 - In audit plugin I cannot see the event subclasses,Sergey Vojtovich2010-04-151-3/+4
* | | | | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-211-1/+3
|/ / / / / / / /
* | | | | | | | WL#5030: Splitting mysql_priv.hMats Kindahl2010-04-061-0/+35
* | | | | | | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+2
* | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-2412-210/+4397
|\ \ \ \ \ \ \ \
| * | | | | | | | Bug#51878 Build break in HPUX involving mysql_prlock on a clientMarc Alff2010-03-091-0/+16
| * | | | | | | | Bug#51295 Build warnings in mdl.ccMarc Alff2010-03-071-1/+265
| |/ / / / / / /
| * | | | | | | mergeVladislav Vaintroub2010-02-132-1/+8
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marcMarc Alff2010-01-274-204/+334
| | |\ \ \ \ \ \ \