summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
Commit message (Expand)AuthorAgeFilesLines
* MariaDB 5.2 -> MariaDB 5.3 merge Sergey Petrunya2010-06-261-6/+216
|\
| * merge 5.1->5.2Sergei Golubchik2010-06-011-0/+3
| |\
| | * Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-0/+3
| | |\
| | | * Bug#51377 Crash in information_schema / processlist on concurrent DDL wo...Alexey Botchkov2010-03-091-0/+3
| * | | rename "partitioned key cache" to "segmented"Sergei Golubchik2010-05-261-2/+2
| * | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-1/+30
| * | | more fixes for buildbot failuresSergei Golubchik2010-04-061-11/+14
| * | | Post review fixes.Igor Babaev2010-04-051-1/+1
| * | | Merge with the latest changes of 5.2Igor Babaev2010-04-031-5/+37
| |\ \ \
| | * | | fixes for windows buildsSergei Golubchik2010-04-021-2/+2
| | * | | Maria WL#61unknown2010-04-011-3/+35
| * | | | Post-review fixes.Igor Babaev2010-04-011-14/+15
| * | | | Merge with the latest changes in the 5.2 tree.Igor Babaev2010-03-291-9/+8
| |\ \ \ \ | | |/ / /
| * | | | WL#86: Partitioned key cache for MyISAM.Igor Babaev2010-02-161-0/+142
* | | | | Merge MariaDB-5.2 -> MariaDB 5.3Sergey Petrunya2010-03-201-39/+144
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | mergedSergei Golubchik2010-03-151-9/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-9/+8
| | |\ \ | | | |/
| | | * Bug #50276: Security flaw in INFORMATION_SCHEMA.TABLESGeorgi Kodinov2010-01-211-4/+4
| | | * Bug#49501 Inefficient information_schema check (system collation), addonSergey Glukhov2010-01-221-1/+1
| | | * Bug#49501 Inefficient information_schema check (system collation)Sergey Glukhov2010-01-191-5/+4
| | | * Bug #48985: show create table crashes if previous access to the table was killedGeorgi Kodinov2009-12-031-1/+1
| * | | merge 5.1->5.2unknown2010-02-011-1/+1
| |\ \ \ | | |/ /
| | * | Merge with MySQL 5.1.42Michael Widenius2010-01-151-1/+1
| | |\ \
| | | * | Bug #48985: show create table crashes if previous access to the table Georgi Kodinov2009-12-151-1/+1
| | | |/
| * | | merge 5.1-> 5.2unknown2009-12-081-30/+136
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-301-30/+132
| | |\ \
| | | * \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-30/+134
| | | |\ \ | | | | |/
| | | | * Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-6/+6
| | | | * Merge of Bug#35996Martin Hansson2009-09-301-1/+1
| | | | |\
| | | | | * mergingAlexey Botchkov2009-09-291-47/+26
| | | | | |\
| | | | | * | Bug#43733 Select on processlist let the embedded server crash (concurren...Alexey Botchkov2009-06-041-1/+1
| | | | * | | Bug#35996: SELECT + SHOW VIEW should be enough to displayMartin Hansson2009-09-281-18/+125
| | | | | |/ | | | | |/|
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-0/+2
| | * | | | Remove compiler warnings (Including some warnings from -Wstrict-aliasing)Michael Widenius2009-11-301-0/+2
| | * | | | Added protection around usage of thd->mysys_varMichael Widenius2009-11-261-0/+2
| | |/ / /
* | | | | Backport of subquery optimizations to 5.3.Sergey Petrunya2010-01-171-3/+4
|/ / / /
* | | | Merge of the patch introducing virtual columns into maria-5.2Igor Babaev2009-11-111-3/+23
|\ \ \ \
| * \ \ \ MergeIgor Babaev2009-11-091-2/+6
| |\ \ \ \ | | |/ / /
| | * | | Fixed problem with schema tables and DECIMALMichael Widenius2009-11-021-0/+6
| | * | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+0
| | |\ \ \ | | | |/ /
| | | * | Fix for bug #46614: Assertion in show_create_trigger() Ramil Kalimullin2009-08-141-2/+0
| * | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns.Igor Babaev2009-10-161-1/+17
| |/ / /
* | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-8/+404
|/ / /
* | | Merge Percona microsec_process patch into MariaDB.unknown2009-09-231-4/+9
* | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-7/+3
|\ \ \
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-7/+3
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-6/+15
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | removing unused array (compiler warning)Guilhem Bichot2009-07-291-3/+0
| * | Bug#45829 "CREATE TABLE TRANSACTIONAL PAGE_CHECKSUM ROW_FORMAT=PAGE accepted,...Guilhem Bichot2009-07-291-22/+0
| * | Merge from 5.0Gleb Shchepa2009-07-241-5/+3
| |\ \