summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
Commit message (Expand)AuthorAgeFilesLines
* MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-3/+5
* Merge with 5.1Michael Widenius2010-04-011-0/+2
|\
| * Removed compiler warningMichael Widenius2010-03-301-0/+2
* | pluggable auth with plugin examplesSergei Golubchik2010-03-291-1/+2
* | mergedSergei Golubchik2010-03-151-1/+4
|\ \ | |/
| * Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+4
| |\
| | * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-1/+1
| | * BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-201-0/+1
| | * Auto-merged.Evgeny Potemkin2009-12-021-0/+2
| | |\
| | | * Bug#48508: Crash on prepared statement re-execution.Evgeny Potemkin2009-12-011-0/+2
* | | | merge 5.1-> 5.2unknown2009-12-081-4/+70
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-4/+69
| |\ \ \
| | * \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-4/+69
| | |\ \ \ | | | |/ /
| | | * | manual merge of 28141Tatiana A. Nurnberg2009-10-201-0/+6
| | | |\ \ | | | | |/
| | | | * Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-191-0/+6
| | | * | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-2/+5
| | | * | Bug#47280 - strange results from count(*) with order by multiple Jorgen Loland2009-10-141-1/+26
| | | * | auto-mergeIngo Struewing2009-10-011-0/+5
| | | |\ \
| | | | * | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+5
| | | * | | Bug#46958: Assertion in Diagnostics_area::set_ok_status, Martin Hansson2009-09-281-1/+2
| | | |/ /
| | | * | Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent tableSergey Glukhov2009-09-101-0/+25
| * | | | Added protection around usage of thd->mysys_varMichael Widenius2009-11-261-0/+1
| |/ / /
* | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+2
|\ \ \ \
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+2
| |/ / /
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-4/+30
|/ / /
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-0/+7
|\ \ \
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+7
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-25/+77
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-1/+1
| |\ \
| | * \ Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-3/+40
| | |\ \
| | * | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-1/+1
| * | | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+1
| * | | | Merge from 5.0Gleb Shchepa2009-07-241-21/+31
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-21/+31
| | * | | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-1/+1
| | * | | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-0/+11
| | |\ \ \
| | * \ \ \ Merge from Tim's 5.0.76-release tree to make 5.0.77 .Chad MILLER2009-01-211-0/+7
| | |\ \ \ \
| | * \ \ \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-11/+19
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-6/+38
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+8
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+8
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+8
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-0/+8
| | | | | |\ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a comment for thd->proc_info.Konstantin Osipov2009-07-221-0/+4
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Fix for a valgrind warning due to use of a uninitializedDavi Arnaut2009-06-081-1/+2
| * | | | | | | | | | | | Bug#44672: Assertion failed: thd->transaction.xid_state.xid.is_null()Davi Arnaut2009-06-051-0/+8
| * | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-1/+1
| * | | | | | | | | | | | Bug#44658 Create procedure makes server crash when user does not have ALL pri...Kristofer Pettersson2009-05-291-1/+29
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /