Commit 32058ba9 authored by Georgi Kodinov's avatar Georgi Kodinov

Addendum 2 for bug #46175: NULL read_view and consistent read assertion

Fixed a compilation warning.
parent 07c30f91
...@@ -769,7 +769,7 @@ protected: ...@@ -769,7 +769,7 @@ protected:
if ((res= item->save_in_field(to_field, 1))) if ((res= item->save_in_field(to_field, 1)))
{ {
if (!err) if (!err)
err= res; err= res < 0 ? 1 : res; /* 1=STORE_KEY_FATAL */
} }
/* /*
Item::save_in_field() may call Item::val_xxx(). And if this is a subquery Item::save_in_field() may call Item::val_xxx(). And if this is a subquery
...@@ -779,7 +779,7 @@ protected: ...@@ -779,7 +779,7 @@ protected:
err= 1; /* STORE_KEY_FATAL */ err= 1; /* STORE_KEY_FATAL */
} }
null_key= to_field->is_null() || item->null_value; null_key= to_field->is_null() || item->null_value;
return ((err < 0 || err > 2) ? STORE_KEY_FATAL : (store_key_result) err); return (err > 2 ? STORE_KEY_FATAL : (store_key_result) err);
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment