database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

Browse Source 
into  mysql.com:/home/psergey/mysql-5.1-bug20484-push


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2006-07-19 05:43:23 +04:00
parent b3523520f8 d2f08db40c
commit 9b7de67c04
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_select.cc
View File

@ -14110,6 +14110,9 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
}
item_list.push_back(new Item_string(table_name_buffer, len, cs));
}
/* partitions */
if (join->thd->lex->describe & DESCRIBE_PARTITIONS)
item_list.push_back(item_null);
/* type */
item_list.push_back(new Item_string(join_type_str[JT_ALL],
strlen(join_type_str[JT_ALL]),