diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-05-13 18:58:26 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-05-13 18:58:26 +0300 |
| commit | dc1e55f8194db83e7a40dea5bf49e9fef970826c (patch) | |
| tree | b0c44d624533c05fb3586c52901c5d00fe1f3186 /sql/sql_insert.cc | |
| parent | 4ccf66df87bfe9290d686e7abd585d3ffe1c1370 (diff) | |
| download | mariadb-git-dc1e55f8194db83e7a40dea5bf49e9fef970826c.tar.gz | |
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
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index e02f457fd77..33a13fabdc6 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -219,7 +219,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, if (fields.elements || !value_count) { restore_record(table,2); // Get empty record - if (fill_record(fields,*values) || check_null_fields(thd,table)) + if (fill_record(fields, *values, 0) || check_null_fields(thd,table)) { if (values_list.elements != 1) { @@ -236,7 +236,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, List<Item> &fields, restore_record(table,2); // Get empty record else table->record[0][0]=table->record[2][0]; // Fix delete marker - if (fill_record(table->field,*values)) + if (fill_record(table->field, *values, 0)) { if (values_list.elements != 1) { @@ -1330,9 +1330,9 @@ bool select_insert::send_data(List<Item> &values) return 0; } if (fields->elements) - fill_record(*fields,values); + fill_record(*fields, values, 1); else - fill_record(table->field,values); + fill_record(table->field, values, 1); if (write_record(table,&info)) return 1; if (table->next_number_field) // Clear for next record @@ -1444,7 +1444,7 @@ bool select_create::send_data(List<Item> &values) thd->offset_limit--; return 0; } - fill_record(field,values); + fill_record(field, values, 1); if (write_record(table,&info)) return 1; if (table->next_number_field) // Clear for next record |