mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Fixed a compilation warning.
This commit is contained in:
Georgi Kodinov 2010-02-15 10:54:27 +02:00
parent 07c30f911e
commit 32058ba9c6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sql/sql_select.h
View file

@ -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:
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);
} }
}; };