mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Fix for UNION and LEFT JOIN (Bug #386)
Fixed wrong logging of Access denied error (Bug #398) include/my_global.h: Fix for QNX mysql-test/r/union.result: new test case mysql-test/t/union.test: Test of bug in union and left join mysys/my_seek.c: Safety fix to find out when pos gets a wrong value sql/field.h: Fix for UNION and LEFT JOIN sql/mysql_priv.h: Fix for UNION and LEFT JOIN sql/sql_base.cc: Fix for UNION and LEFT JOIN sql/sql_insert.cc: Fix for UNION and LEFT JOIN sql/sql_parse.cc: Fixed wrong logging of Access denied error sql/sql_union.cc: Fix for UNION and LEFT JOIN sql/sql_update.cc: Fix for UNION and LEFT JOIN
This commit is contained in:
@@ -110,7 +110,8 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
|
||||
while ((item= it++))
|
||||
if (item_list.push_back(item))
|
||||
DBUG_RETURN(-1);
|
||||
if (setup_fields(thd,first_table,item_list,0,0,1))
|
||||
if (setup_tables(first_table) ||
|
||||
setup_fields(thd,first_table,item_list,0,0,1))
|
||||
DBUG_RETURN(-1);
|
||||
}
|
||||
|
||||
@@ -259,7 +260,7 @@ bool select_union::send_data(List<Item> &values)
|
||||
return 0;
|
||||
}
|
||||
|
||||
fill_record(table->field,values);
|
||||
fill_record(table->field, values, 1);
|
||||
if ((write_record(table,&info)))
|
||||
{
|
||||
if (create_myisam_from_heap(thd, table, tmp_table_param, info.last_errno,
|
||||
|
Reference in New Issue
Block a user