mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Change of internal key_field=NULL handling to avoid error messages.
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT Fixed reference to uninitalized variable mysql-test/r/distinct.result: Updated results for new tests mysql-test/r/func_math.result: Fixed test of RND() mysql-test/r/innodb.result: Updated results for new tests mysql-test/r/null.result: Updated results for new tests mysql-test/t/distinct.test: New distinct test mysql-test/t/func_math.test: Fixed test of RND() mysql-test/t/innodb.test: Test for bugs mysql-test/t/null.test: TEst for bugs sql/field.h: Change of NULL handling to avoid error messages sql/field_conv.cc: Change of NULL handling to avoid error messages sql/item.cc: Change of NULL handling to avoid error messages sql/item.h: Change of NULL handling to avoid error messages sql/item_cmpfunc.cc: Change of NULL handling to avoid error messages sql/item_func.cc: Change of NULL handling to avoid error messages sql/item_func.h: Cleaned up RND() handling sql/item_timefunc.cc: Change of NULL handling to avoid error messages sql/item_timefunc.h: Change of NULL handling to avoid error messages sql/opt_range.cc: Fixed bug in <=> NULL sql/password.c: Indentation cleanup sql/sql_base.cc: Change of NULL handling to avoid error messages sql/sql_class.cc: Fixed reference to uninitalized variable sql/sql_handler.cc: Change of NULL handling to avoid error messages sql/sql_select.cc: Change of NULL handling to avoid error messages Optimized SELECT DISTINCT ... ORDER BY ... LIMIT sql/sql_select.h: Change of NULL handling to avoid error messages sql/unireg.cc: Change of NULL handling to avoid error messages
This commit is contained in:
@ -247,12 +247,12 @@ class store_key_field: public store_key
|
||||
copy_field.set(to_field,from_field,0);
|
||||
}
|
||||
}
|
||||
bool copy()
|
||||
{
|
||||
copy_field.do_copy(©_field);
|
||||
return err != 0;
|
||||
}
|
||||
const char *name() const { return field_name; }
|
||||
bool copy()
|
||||
{
|
||||
copy_field.do_copy(©_field);
|
||||
return err != 0;
|
||||
}
|
||||
const char *name() const { return field_name; }
|
||||
};
|
||||
|
||||
|
||||
@ -269,8 +269,7 @@ public:
|
||||
{}
|
||||
bool copy()
|
||||
{
|
||||
item->save_in_field(to_field);
|
||||
return err != 0;
|
||||
return item->save_in_field(to_field, 1) || err != 0;
|
||||
}
|
||||
const char *name() const { return "func"; }
|
||||
};
|
||||
@ -293,7 +292,8 @@ public:
|
||||
if (!inited)
|
||||
{
|
||||
inited=1;
|
||||
item->save_in_field(to_field);
|
||||
if (item->save_in_field(to_field, 1))
|
||||
err= 1;
|
||||
}
|
||||
return err != 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user