summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
Commit message (Collapse)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 ↵Sergei Golubchik2016-03-191-0/+3
| | | | | | | | Diagnostics_area::message() ; connect.xml* tests fail in buildbot
* | MDEV-9641 MDEV-9644 NULLIF assertionsSergei Golubchik2016-03-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | * only copy args[0] to args[2] after fix_fields (when all item substitutions have already happened) * change QT_ITEM_FUNC_NULLIF_TO_CASE (that allows to print NULLIF as CASE) to QT_ITEM_ORIGINAL_FUNC_NULLIF (that prohibits it). So that NULLIF-to-CASE is allowed by default and only disabled explicitly for SHOW VIEW|FUNCTION|PROCEDURE and mysql_make_view. By default it is allowed (in particular in error messages and debug output, that can happen anytime before or after optimizer).
* | 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
| | |\ | | | | | | | | | | | | | | | | reverted about half of commits as either not applicable or outright wrong
| | | * Bug#21205695 DROP TABLE MAY CAUSE SLAVES TO BREAKVenkatesh Duggirala2015-12-011-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: ======== 1) Drop table queries are re-generated by server before writing the events(queries) into binlog for various reasons. If table name/db name contains a non regular characters (like latin characters), the generated query is wrong. Hence it breaks the replication. 2) In the edge case, when table name/db name contains 64 characters, server is throwing an assert assert(M_TBLLEN < 128) 3) In the edge case, when db name contains 64 latin characters, binlog content is interpreted badly which is leading replication failure. Analysis & Fix : ================ 1) Parser reads the table name from the query and converts it to standard charset(utf8) and stores it in table_name variable. When drop table query is regenerated with the same table_name variable, it should be converted back to the original charset from standard charset(utf8). 2) Latin character takes two bytes for each character. Limit of the identifier is 64. SYSTEM_CHARSET_MBMAXLEN is set to '3'. So there is a possiblity that tablename/dbname contains 3 * 64. Hence assert is changed to (M_TBLLEN <= NAME_CHAR_LEN*SYSTEM_CHARSET_MBMAXLEN) 3) db_len in the binlog event header is taking 1 byte. db_len is ranged from 0 to 192 bytes (3 * 64). While reading the db_len from the event, server is casting to uint instead of uchar which is leading to bad db_len. This problem is fixed by changing the cast type to uchar.
* | | | disable SHOW I_S_table for built-in I_S tablesSergei Golubchik2016-02-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes MDEV-9538 Server crashes in check_show_access on SHOW STATISTICS MDEV-9539 Server crashes in make_columns_old_format on SHOW GEOMETRY_COLUMNS MDEV-9540 SHOW SPATIAL_REF_SYS and SHOW SYSTEM_VARIABLES return empty results with numerous warnings
* | | | MDEV-9307 - provide info about DATA/INDEX directory in INFORMATION_SCHEMA.TAVladislav Vaintroub2016-02-221-2/+11
| | | | | | | | | | | | | | | | BLES (in CREATE_OPTIONS column)
* | | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-281-8/+16
| | | | | | | | | | | | | | | | Fix for SHOW CREATE DATABASE.
* | | | compiler warningsSergei Golubchik2016-01-271-1/+0
| | | |
* | | | MDEV-5273 Prepared statement doesn't return metadata after prepare.Alexey Botchkov2016-01-261-28/+62
| | | | | | | | | | | | | | | | | | | | The metadata creation part of the mysqld_shww_create separated to be used on the mysqld_stmt_prepare stage.
* | | | 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 ↵Alexey Botchkov2015-12-211-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expected contents. Table content filled appropriately. Thare are still just two records as we don't have geodetics yet.
* | | | | 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 ↵Sergei Golubchik2015-12-111-1/+1
| | | | | | | | | | | | | | | | along with a table collation
| | * | MDEV-9226 SHOW COLUMNS returns wrong column order for tables with large ENUMsSergei Golubchik2015-12-081-2/+3
| | | | | | | | | | | | | | | | | | | | set keep_row_order=true for temporary tables that hold results of the SHOW command
* | | | 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 ↵Sergei Golubchik2015-10-081-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | many rows make_cond_for_info_schema() does preserve outer fields
* | | | MDEV-8836 - Server crashed in my_copy_8bit on querying I_S.PROCESSLISTSergey Vojtovich2015-10-011-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fixed race condition in code filling INFORMATION_SCHEMA.PROCESSLIST.INFO_BINARY. When loading query string/length of another connection one must have LOCK_thd_data locked.
* | | | 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 ↵Oleksandr Byelkin2015-09-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output of SHOW PROCESSLIST Added tid (thread ID) for system where it is present. ps -eL -o tid,pid,command shows the thread on Linux
* | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In galera, like other DDLs, CREATE/ALTER VIEW commands are recreated and replicated during parsing. The ALGORITHM clause is internally set to VIEW_ALGORITHM_INHERIT if its not explicitly specified by the user. But since its not a valid type to be used in a command, it leads to an assertion failure. The solution is to not include the ALGORITHM clause in the command if its not explicitly specified (or INHERIT).
| | * | | | 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 -r4264 maria/5.5 Text conflict in sql/mysqld.cc Text conflict in storage/xtradb/btr/btr0cur.c Text conflict in storage/xtradb/buf/buf0buf.c Text conflict in storage/xtradb/buf/buf0lru.c Text conflict in storage/xtradb/handler/ha_innodb.cc 5 conflicts encountered.
| | * \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bzr merge -r tag:mariadb-5.5.35 maria/5.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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bzr merge lp:maria/5.5 -rtag:mariadb-5.5.31 Text conflict in cmake/cpack_rpm.cmake Text conflict in debian/dist/Debian/control Text conflict in debian/dist/Ubuntu/control Text conflict in sql/CMakeLists.txt Conflict adding file sql/db.opt. Moved existing file to sql/db.opt.moved. Conflict adding file sql/db.opt.moved. Moved existing file to sql/db.opt.moved.moved. Text conflict in sql/mysqld.cc Text conflict in support-files/mysql.spec.sh 8 conflicts encountered.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bzr merge -r tag:mariadb-5.5.28a lp:maria/5.5 ...no conflicts
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bzr merge lp:maria/5.5 ... Text conflict in CMakeLists.txt Text conflict in sql/mysqld.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_truncate.cc 4 conflicts encountered.
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ References lp:1034621 - Merge up to mysql-5.5.25 levelSeppo Jaakola2012-08-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merged codership-mysql/5.5 revisions: bzr diff -r3759..3767 merged codership-mysql/5.5 revisions: bzr diff -r3768..3771
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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 of: lp:maria/5.5, #3334: http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/3334 lp:codership-mysql/5.5, #3725: http://bazaar.launchpad.net/~codership/codership-mysql/wsrep-5.5/revision/3725
| * | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status