diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 16:50:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-13 16:50:26 +0300 |
| commit | f40491155704ba6e280e2c22b722a7af1d202895 (patch) | |
| tree | 27dd56fbc9caf4e63502ed4b993f8c786370dd40 /storage/myisam | |
| parent | 2aab7f2d0a6555f7ebb6dcde243639354ca5da53 (diff) | |
| parent | 1f5615360cce22875ae2ab92386704b2ba363d8b (diff) | |
| download | mariadb-git-f40491155704ba6e280e2c22b722a7af1d202895.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/ha_myisam.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/ha_myisam.cc b/storage/myisam/ha_myisam.cc index 3a2e886e6ce..4fef809f4f0 100644 --- a/storage/myisam/ha_myisam.cc +++ b/storage/myisam/ha_myisam.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2000, 2018, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB Corporation. + Copyright (c) 2009, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -730,7 +730,7 @@ static int compute_vcols(MI_INFO *info, uchar *record, int keynum) { Field *f= table->field[kp->fieldnr - 1]; if (f->vcol_info && !f->vcol_info->stored_in_db) - table->update_virtual_field(f); + table->update_virtual_field(f, false); } mysql_mutex_unlock(&info->s->intern_lock); return 0; |