summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-0/+53
|\
| * The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-0/+53
* | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-5/+78
|/
* Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-0/+2
|\
| * Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+2
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-26/+128
|\ \ | |/ |/|
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-0/+6
| |\
| | * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-14/+26
| | |\
| | * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-0/+6
| * | | Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+60
| * | | Bug#46265: Can not disable warning about unsafe statements for binary loggingDavi Arnaut2009-07-311-1/+2
| * | | Merge from 5.0Gleb Shchepa2009-07-241-6/+25
| |\ \ \ | | |_|/ | |/| |
| | * | Bug #38816: kill + flush tables with read lock + storedGleb Shchepa2009-07-241-6/+25
| | * | merged 5.0-main -> 5.0-bugteamGeorgi Kodinov2009-05-151-0/+17
| | |\ \
| | | * | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-2/+2
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-2/+29
| | | |\ \
| | | * \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-3/+13
| | | |\ \ \
| | | * \ \ \ Merge from 5.0 trunk.Chad MILLER2008-07-141-0/+7
| | | |\ \ \ \
| | | * \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-7/+11
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+17
| | | |\ \ \ \ \ \
| | | | * | | | | | Push history-limiting code until after the code that adds new unknown2007-11-141-0/+14
| | | | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+3
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+3
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-0/+3
| | | | | | |\ \ \ \ \ \
| * | | | | | | | | | | | BUG#42851: Spurious "Statement is not safe to log in statementLuis Soares2009-06-271-1/+3
| * | | | | | | | | | | | Bug #34002 uninitialized Rows_examined for some admin queriesStaale Smedseng2009-06-251-0/+1
| * | | | | | | | | | | | Fix for a valgrind warning due to use of a uninitializedDavi Arnaut2009-06-081-1/+1
| * | | | | | | | | | | | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-2/+2
| * | | | | | | | | | | | Bug#44658 Create procedure makes server crash when user does not have ALL pri...Kristofer Pettersson2009-05-291-10/+19
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Manual merge.Ramil Kalimullin2009-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Fix for bug#42009: SELECT into variable gives different results to direct SELECTRamil Kalimullin2009-05-101-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Fix for bug#42009: SELECT into variable gives different results to direct SELECTRamil Kalimullin2009-02-241-1/+1
| * | | | | | | | | | | BUG#42640 mysqld crashes when unsafe statements are executed (STRICT_TRANS_TA...Guangbao Ni2009-04-031-1/+5
* | | | | | | | | | | | Fixed problems in mergeMichael Widenius2009-05-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
* | | | | | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Manual merge.Ramil Kalimullin2009-03-251-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Auto-mergeRamil Kalimullin2009-03-251-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Fix for bug#35383: binlog playback and replication breaksRamil Kalimullin2009-03-251-0/+1
| * | | | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threadsTatiana A. Nurnberg2009-03-251-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Bug#43748: crash when non-super user tries to kill the replication threadsTatiana A. Nurnberg2009-03-251-0/+7
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | merged 5.0-bugteam -> 5.1-bugteamGeorgi Kodinov2009-03-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Bug#43461: invalid comparison with string literal in default.cDavi Arnaut2009-03-191-1/+1
| | * | | | | | | | | | | Manual mergeKristofer Pettersson2009-03-061-1/+14
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | BUG#37051 Replication rules not evaluated correctlyHe Zhenxing2009-03-051-1/+5
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Bug#40363 Bug 20023 is not fixed on 5.0Kristofer Pettersson2009-03-051-0/+6
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
* | | | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | BUG#41980 SBL, INSERT .. SELECT .. LIMIT = ERROR, even when @@SQL_LOG_BIN is 0 !Guangbao Ni2009-03-051-1/+3
| | * | | | | | | | | | Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.Alexey Kopytov2009-02-131-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |