database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
This commit is contained in:
evgen@sunlight.local
2006-08-01 09:24:19 +04:00
parent 799ecc9f2a 6056f7714e
commit dda7a95c59
76 changed files with 937 additions and 679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.cc
View File

@@ -861,6 +861,11 @@ int THD::send_explain_fields(select_result *result)
item->maybe_null=1;
field_list.push_back(item= new Item_return_int("rows", 10,
MYSQL_TYPE_LONGLONG));
if (lex->describe & DESCRIBE_EXTENDED)
{
field_list.push_back(item= new Item_float("filtered", 0.1234, 2, 4));
item->maybe_null=1;
}
item->maybe_null= 1;
field_list.push_back(new Item_empty_string("Extra", 255, cs));
return (result->send_fields(field_list,