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 branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-02-25 18:19:55 +01:00
parent 0485328d03 0251232f8c
commit 00d1db7a38
372 changed files with 10986 additions and 4523 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/field.h
View File

@@ -609,6 +609,13 @@ public:
{
in_partitioning_expr= TRUE;
}
bool is_equal(Virtual_column_info* vcol)
{
return field_type == vcol->get_real_type()
&& stored_in_db == vcol->is_stored()
&& expr_str.length == vcol->expr_str.length
&& memcmp(expr_str.str, vcol->expr_str.str, expr_str.length) == 0;
}
};
class Field: public Value_source
@@ -3159,7 +3166,7 @@ public:
int store_field(Field *from)
{ // Be sure the value is stored
from->val_str(&value);
if (!value.is_alloced() && from->is_updatable())
if (table->copy_blobs || (!value.is_alloced() && from->is_updatable()))
value.copy();
return store(value.ptr(), value.length(), from->charset());
}