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

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-07-18 16:46:57 +02:00
parent 8a23ae088d 97e640b9ae
commit 5f6380adde
1818 changed files with 11042 additions and 3689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_union.cc
View File

@ -83,13 +83,16 @@ int select_union::send_data(List<Item> &values)
*/
return -1;
}
bool is_duplicate;
/* create_internal_tmp_table_from_heap will generate error if needed */
if (table->file->is_fatal_error(write_err, HA_CHECK_DUP) &&
create_internal_tmp_table_from_heap(thd, table,
tmp_table_param.start_recinfo,
&tmp_table_param.recinfo,
write_err, 1))
write_err, 1, &is_duplicate))
return 1;
if (is_duplicate)
return -1;
}
return 0;
}