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 sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
This commit is contained in:
bell@sanja.is.com.ua
2004-09-17 19:16:54 +03:00
parent 5b10e3e5b5 226d4ad8f4
commit 26589ba8ce
7 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_insert.cc
View File

@ -490,13 +490,13 @@ static bool check_view_insertability(TABLE_LIST *view, ulong query_id)
{
Item_field *field;
/* simple SELECT list entry (field without expression) */
if ((*trans)->type() != Item::FIELD_ITEM)
if (!(field= (*trans)->filed_for_view_update()))
DBUG_RETURN(TRUE);
field= (Item_field *)(*trans);
if (field->field->unireg_check == Field::NEXT_NUMBER)
view->contain_auto_increment= 1;
/* prepare unique test */
field->field->query_id= other_query_id;
*trans= field; // remove collation if we have it
}
/* unique test */
for (trans= trans_start; trans != trans_end; trans++)