diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-01 19:51:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-10-08 15:24:07 +0200 |
| commit | 7fc6a4b94f473347f5fb8f2700f08f041dcfbc07 (patch) | |
| tree | 9e91b228c89e0b9cafc3833e261c96e501e85169 | |
| parent | d902e45b27a12b5b7ff705b8e977460b770ca8a4 (diff) | |
| download | mariadb-git-7fc6a4b94f473347f5fb8f2700f08f041dcfbc07.tar.gz | |
cleanup: don't update_virtual_fields from READ_RECORD
it was done only in some access methods, not in all,
so the caller had to update_virtual_fields anyway.
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result | 2 | ||||
| -rw-r--r-- | sql/records.cc | 4 |
3 files changed, 0 insertions, 8 deletions
diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result index f9a7e2cc65c..20f971340f8 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_innodb.result @@ -2694,7 +2694,6 @@ a b -1 18446744073709551615 Warnings: Note 1105 Cast to unsigned converted negative integer to it's positive complement -Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # Convert() @@ -2716,7 +2715,6 @@ a b -1 18446744073709551615 Warnings: Note 1105 Cast to unsigned converted negative integer to it's positive complement -Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # diff --git a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result index 184b4a441b2..05f5780fdc8 100644 --- a/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result +++ b/mysql-test/suite/vcol/r/vcol_supported_sql_funcs_myisam.result @@ -2694,7 +2694,6 @@ a b -1 18446744073709551615 Warnings: Note 1105 Cast to unsigned converted negative integer to it's positive complement -Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # Convert() @@ -2716,7 +2715,6 @@ a b -1 18446744073709551615 Warnings: Note 1105 Cast to unsigned converted negative integer to it's positive complement -Note 1105 Cast to unsigned converted negative integer to it's positive complement drop table t1; set sql_warnings = 0; # diff --git a/sql/records.cc b/sql/records.cc index 3995bea6569..2c7efb17cb4 100644 --- a/sql/records.cc +++ b/sql/records.cc @@ -358,8 +358,6 @@ static int rr_quick(READ_RECORD *info) break; } } - if (info->table->vfield) - update_virtual_fields(info->thd, info->table); return tmp; } @@ -483,8 +481,6 @@ int rr_sequential(READ_RECORD *info) break; } } - if (!tmp && info->table->vfield) - update_virtual_fields(info->thd, info->table); return tmp; } |