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:
@@ -277,7 +277,7 @@ int mysql_update(THD *thd,
|
||||
if (!(select && select->skipp_record()))
|
||||
{
|
||||
store_record(table,1);
|
||||
if (fill_record(fields,values))
|
||||
if (fill_record(fields, values, 0))
|
||||
break; /* purecov: inspected */
|
||||
found++;
|
||||
if (compare_record(table, query_id))
|
||||
@@ -726,7 +726,7 @@ bool multi_update::send_data(List<Item> ¬_used_values)
|
||||
{
|
||||
table->status|= STATUS_UPDATED;
|
||||
store_record(table,1);
|
||||
if (fill_record(*fields_for_table[offset], *values_for_table[offset]))
|
||||
if (fill_record(*fields_for_table[offset], *values_for_table[offset],0 ))
|
||||
DBUG_RETURN(1);
|
||||
found++;
|
||||
if (compare_record(table, thd->query_id))
|
||||
@@ -754,7 +754,7 @@ bool multi_update::send_data(List<Item> ¬_used_values)
|
||||
{
|
||||
int error;
|
||||
TABLE *tmp_table= tmp_tables[offset];
|
||||
fill_record(tmp_table->field+1, *values_for_table[offset]);
|
||||
fill_record(tmp_table->field+1, *values_for_table[offset], 1);
|
||||
found++;
|
||||
/* Store pointer to row */
|
||||
memcpy((char*) tmp_table->field[0]->ptr,
|
||||
|
Reference in New Issue
Block a user