summaryrefslogtreecommitdiff
path: root/sql/set_var.cc
Commit message (Expand)AuthorAgeFilesLines
* cleanupsSergei Golubchik2011-10-191-1/+0
* merge with 5.3Sergei Golubchik2011-10-191-1/+2
|\
| * Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-0/+4
| * Added read only system variable 'in_transaction' which tells if there'sSergei Golubchik2011-07-011-19/+23
| * Merge with Sergei's tree to get in latest microsecond patches and also fixes ...Michael Widenius2011-06-111-5/+11
| |\
| | * merge with 5.1-microSergei Golubchik2011-06-071-5/+11
| | |\
| | | * revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-3/+7
| * | | Fixed compile failure when we don't use system zlibMichael Widenius2011-06-091-1/+1
| |/ /
| * | Change optimizer_use_mrr=auto|disable|forceSergey Petrunya2011-06-031-11/+0
| * | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-281-1/+1
| * | Merge with 5.1-microsecondsMichael Widenius2011-05-281-12/+11
| |\ \ | | |/
| | * post review changes 2Sergei Golubchik2011-05-191-1/+1
| | * wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-10/+10
| * | Rewritten patch of percona - switching query cache on and off, removing comme...unknown2011-05-181-13/+78
| * | Merge with MariaDB 5.2Michael Widenius2011-05-101-10/+50
| |\ \
| | * \ Merge with MariaDB 5.1Michael Widenius2011-05-031-10/+50
| | |\ \
| | | * \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-11/+51
| | | |\ \
| * | | \ \ Merge various replication-related patches into MariaDB 5.3:unknown2011-04-081-0/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-011-66/+55
| | |\ \ \ \ \
| | * | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-101-0/+3
| * | | | | | | mergeVladislav Vaintroub2011-03-291-0/+4
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | lp:702084 - myisam_block_size is not reported in SHOW GLOBAL VARIABLESSergei Golubchik2011-03-281-0/+4
| * | | | | | | mergeVladislav Vaintroub2011-03-261-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs wi...Michael Widenius2011-03-231-0/+2
| | | |/ / / / | | |/| | | |
| * | | | | | Merge with 5.2Michael Widenius2011-03-091-59/+44
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-58/+43
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-58/+43
| | | |\ \ \ \
| | * | \ \ \ \ Merge with alias as StringMichael Widenius2011-02-281-8/+12
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-8/+12
| * | | | | | | Merge.Igor Babaev2010-12-101-1/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ MergeIgor Babaev2010-11-051-1/+4
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge 5.3-mwl128 -> 5.3Igor Babaev2010-10-271-1/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | The main patch for MWL#128: Implement Block Nested Loop Hash Join.Igor Babaev2010-08-311-1/+4
| * | | | | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge with 5.1Michael Widenius2010-12-041-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | | * | | | | | | | Fix problems seen in Buildbot:unknown2010-12-021-0/+2
| | * | | | | | | | | merge with 5.1Michael Widenius2010-11-301-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| * | | | | | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-8/+12
| | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Automerge with 5.2Michael Widenius2010-11-051-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Automatic merge with 5.1Michael Widenius2010-11-041-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-1/+1
| * | | | | | | Merge 5.2->5.3Sergey Petrunya2010-10-101-35/+47
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | |
| | * | | | | rename maria to ariaSergei Golubchik2010-09-121-4/+4
| | * | | | | merge with 5.1Sergei Golubchik2010-09-111-18/+13
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-18/+13
| | | |\ \ \ \
| | * | \ \ \ \ Merge with MariaDB 5.1.49Michael Widenius2010-08-051-4/+25
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-4/+25
| | | |\ \ \ \ \
| | * | | | | | | --plugin_maturity command-line optionSergei Golubchik2010-06-161-9/+5
| * | | | | | | | MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-22/+46
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /