summaryrefslogtreecommitdiff
path: root/include/mysql
Commit message (Expand)AuthorAgeFilesLines
* 5.2->5.3 mergeSergei Golubchik2011-12-122-18/+22
|\
| * 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-022-18/+22
* | Merge with 5.2.Michael Widenius2011-12-113-2/+21
|\ \ | |/
| * merge, fix Windows warningsVladislav Vaintroub2011-11-291-0/+3
| * Automatic mergeMichael Widenius2011-11-241-2/+4
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\
| | | | * Updated/added copyright headersKent Boortz2011-06-301-2/+4
| * | | | fix dialog plugin to work on windowsSergei Golubchik2011-11-222-0/+15
| |/ / /
* | | | mergeSergei Golubchik2011-10-111-5/+19
|\ \ \ \ | |/ / /
| * | | merge with 5.1Sergei Golubchik2011-10-071-5/+19
| |\ \ \ | | |/ /
| | * | support for plugins on windowsSergei Golubchik2011-10-041-5/+19
* | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-014-7/+106
|/ / /
* | | 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
| |\ \ | | |/
| | * BUG#39053 - UNISTALL PLUGIN does not allow the storage engineSergey Vojtovich2010-04-142-16/+26
| * | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-3/+3
| |\ \ | | |/
| | * Plugin author, description and version are availableSergey Vojtovich2010-03-161-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
|\ \ | |/
| * Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-3/+13
* | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+140
|\ \ | |/
| * WL#4380Narayanan V2008-06-171-0/+139
* | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-0/+10
|\ \ | |/
| * Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...unknown2008-03-071-1/+1
| |\
| * | Applied InnoDB snapshot innodb-5.1-ss2298unknown2008-02-191-0/+10
* | | Merge xiphis.org:/anubis/antony/work/p1-bug34598.2unknown2008-02-191-1/+1
|\ \ \ | | |/ | |/|
| * | Bug#34598unknown2008-02-191-1/+1
| |/
* | after mergeunknown2007-12-281-1/+4
|/
* Never access thd->ha_data directly, use getters/setters from the pluginunknown2007-08-311-0/+23
* Fix doxygen warnings.unknown2007-08-161-1/+1
* Doxygen warnings.unknown2007-08-161-1/+1
* Slow query log to file now displays queries with microsecond precissionunknown2007-07-301-1/+1
* WL#3914: Additonal accessors required to compile InnoDB as a plugin storage e...unknown2007-07-051-0/+123
* Complementary fix for bug #29353: inserting a negative value to a csv table unknown2007-07-031-1/+2
* WL#2936unknown2007-05-011-2/+3
* WL#2936unknown2007-04-301-13/+13
* compilation errorunknown2007-04-291-1/+1
* more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone),unknown2007-04-151-0/+1
* wl#2936 - fixing problemsunknown2007-04-131-4/+4
* WL#2936unknown2007-03-281-4/+6