summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
Commit message (Expand)AuthorAgeFilesLines
* Fixed wrong counting of global Memory_usedMonty2016-04-281-6/+15
* Merge branch '10.0' into 10.1Sergei Golubchik2016-03-211-2/+2
|\
| * Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-041-2/+2
* | MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Dia...Sergei Golubchik2016-03-191-0/+3
* | MDEV-9641 MDEV-9644 NULLIF assertionsSergei Golubchik2016-03-051-1/+2
* | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-14/+11
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-14/+11
| |\
| | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-14/+11
| | |\
| | | * Bug#21205695 DROP TABLE MAY CAUSE SLAVES TO BREAKVenkatesh Duggirala2015-12-011-21/+36
* | | | disable SHOW I_S_table for built-in I_S tablesSergei Golubchik2016-02-231-1/+4
* | | | MDEV-9307 - provide info about DATA/INDEX directory in INFORMATION_SCHEMA.TAVladislav Vaintroub2016-02-221-2/+11
* | | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-8/+16
* | | | compiler warningsSergei Golubchik2016-01-271-1/+0
* | | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-261-28/+62
* | | | Merge branch '10.1' into bb-10.1-sergSergei Golubchik2015-12-221-5/+12
|\ \ \ \
| * | | | MDEV-7540 Information Schema SPATIAL_REF_SYS contents don't match the expecte...Alexey Botchkov2015-12-211-5/+12
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-3/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-3/+4
| |\ \ \ | | |/ /
| | * | MDEV-7655 SHOW CREATE TABLE returns invalid DDL when using virtual columns al...Sergei Golubchik2015-12-111-1/+1
| | * | MDEV-9226 SHOW COLUMNS returns wrong column order for tables with large ENUMsSergei Golubchik2015-12-081-2/+3
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-13/+6
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-7/+8
| |\ \ \ | | |/ /
| | * | MDEV-8796 Delete with sub query with information_schema.TABLES deletes too ma...Sergei Golubchik2015-10-081-7/+8
* | | | MDEV-8836 - Server crashed in my_copy_8bit on querying I_S.PROCESSLISTSergey Vojtovich2015-10-011-9/+9
* | | | Fix to make os_thread_id it compiled on windows.Oleksandr Byelkin2015-09-201-1/+1
* | | | MDEV-6756: map a linux pid (child pid) to a connection id shown in the output...Oleksandr Byelkin2015-09-171-0/+5
* | | | cleanup: commentSergei Golubchik2015-09-031-13/+4
* | | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2015-09-031-2/+5
|\ \ \ \
| * \ \ \ Merge branch '5.5-galera' into 10.0-galeraNirbhay Choubey2015-08-141-22/+37
| |\ \ \ \
| | * \ \ \ Merge tag 'mariadb-5.5.45' into 5.5-galeraNirbhay Choubey2015-08-071-1/+4
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | MDEV-8464 : ALTER VIEW not replicated in some casesNirbhay Choubey2015-07-191-23/+37
| | * | | | Merge tag 'mariadb-5.5.44' into 5.5-galeraNirbhay Choubey2015-06-211-5/+17
| | |\ \ \ \
| | * \ \ \ \ bzr merge -rtag:mariadb-5.5.40 maria/5.5Nirbhay Choubey2014-10-091-69/+69
| | |\ \ \ \ \
| | * \ \ \ \ \ Local merge of mariadb-5.5.39Nirbhay Choubey2014-08-061-2/+3
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ bzr merge -rtag:mariadb-5.5.38 maria/5.5Nirbhay Choubey2014-06-101-8/+63
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154.Jan Lindström2014-04-161-140/+44
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge from maria/5.5 (-rtag:mariadb-5.5.36).Nirbhay Choubey2014-02-251-0/+4
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge of maria/5.5 into maria-5.5-galera.Nirbhay Choubey2014-01-291-2/+5
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge with MariaDB 5.5.34.Jan Lindström2013-11-251-13/+15
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32Seppo Jaakola2013-08-211-15/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ References: MDEV-4572 - merge with mariaDB 5.5.31Seppo Jaakola2013-05-261-26/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1115708 - merged with lp:mariadb/5.5 revision 3657Seppo Jaakola2013-02-051-11/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ References: lp:1066784 - Merged with MariaDB 5.5.28aSeppo Jaakola2012-11-301-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562)Seppo Jaakola2012-10-241-0/+278
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1051808 - merged with lp:maria/5.5Seppo Jaakola2012-09-171-12/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5Seppo Jaakola2012-04-261-9/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. Seppo Jaakola2012-04-131-1/+5
| * | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \