database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Oleksandr Byelkin
2018-08-15 16:48:13 +02:00
parent b62ac16185 1b797e9e63
commit bcc677bb72
19 changed files with 122 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_lex.cc
View File

@ -2410,7 +2410,7 @@ void st_select_lex::print_order(String *str,
{
if (order->counter_used)
{
if (query_type != QT_VIEW_INTERNAL)
if (!(query_type & QT_VIEW_INTERNAL))
{
char buffer[20];
size_t length= my_snprintf(buffer, 20, "%d", order->counter);