summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | MDEV-7222: Cluster Node Crash at CREATE DEFINER statementNirbhay Choubey2015-01-021-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-15/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.14 maria/10.0/Nirbhay Choubey2014-09-281-75/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-56/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.12 maria/10.0Nirbhay Choubey2014-06-191-8/+59
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-143/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV#6079: xtrabackup SST failing with maria-10.0-galeraNirbhay Choubey2014-04-161-0/+33
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-15/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-18/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-12/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-21/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge fix.Jan Lindström2013-09-091-1/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-101/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-19/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '96badb16afcf' into 10.0Jan Lindström2015-08-031-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for MDEV-8301; Statistics for a thread could be counted twice in SHOW ST...Monty2015-06-261-1/+4
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-09-011-8/+9
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-08-271-5/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-08-271-66/+129
View Lorry Controller Status