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 bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into mysql.com:/home/my/mysql-5.0
This commit is contained in:
monty@mysql.com
2005-04-07 19:25:20 +03:00
parent 280fda6093 780202f130
commit 740cc2e095
18 changed files with 346 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -8157,6 +8157,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
*/
(*argp)->maybe_null=1;
}
new_field->query_id= thd->query_id;
}
}
}
@ -8203,6 +8204,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
group_null_items++;
new_field->flags|= GROUP_FLAG;
}
new_field->query_id= thd->query_id;
*(reg_field++) =new_field;
}
if (!--hidden_field_count)