database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge fix for Bug#59211 to mysql-5.5-security

Browse Source
This commit is contained in:
Oystein Grovlen
2011-01-12 11:27:31 +01:00
parent c04979b841 541e0fa8bf
commit a648063319
4 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/item_cmpfunc.cc
View File

@@ -1208,9 +1208,12 @@ get_year_value(THD *thd, Item ***item_arg, Item **cache_arg,
value of 2000.
*/
Item *real_item= item->real_item();
if (!(real_item->type() == Item::FIELD_ITEM &&
((Item_field *)real_item)->field->type() == MYSQL_TYPE_YEAR &&
((Item_field *)real_item)->field->field_length == 4))
Field *field= NULL;
if (real_item->type() == Item::FIELD_ITEM)
field= ((Item_field *)real_item)->field;
else if (real_item->type() == Item::CACHE_ITEM)
field= ((Item_cache *)real_item)->field();
if (!(field && field->type() == MYSQL_TYPE_YEAR && field->field_length == 4))
{
if (value < 70)
value+= 100;