diff options
| author | unknown <sanja@askmonty.org> | 2010-08-03 12:49:25 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2010-08-03 12:49:25 +0300 |
| commit | f8e270dbdc51fae5b6b627c29a0498c87e198383 (patch) | |
| tree | acb57f17def05a64dce25c37ab6fb2ca3ebe4d99 /storage | |
| parent | a008a6eb35cde020f80b4aefa2e3a351d0640c38 (diff) | |
| download | mariadb-git-f8e270dbdc51fae5b6b627c29a0498c87e198383.tar.gz | |
Fix for launchpad bug #612894
Support of virtual columns added to maria engine.
mysql-test/suite/vcol/r/vcol_handler_maria.result:
Basic tests for virtual column and maria engine.
mysql-test/suite/vcol/t/vcol_handler_maria.test:
Basic tests for virtual column and maria engine.
storage/maria/ha_maria.cc:
Support of virtual columns added to maria engine.
storage/maria/ha_maria.h:
Support of virtual columns added to maria engine.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 | ||||
| -rw-r--r-- | storage/maria/ha_maria.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 5495a0d2ffc..4c81fbe521f 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -468,7 +468,7 @@ static int table2maria(TABLE *table_arg, data_file_type row_type, recinfo_pos= recinfo; create_info->null_bytes= table_arg->s->null_bytes; - while (recpos < (uint) share->reclength) + while (recpos < (uint) share->stored_rec_length) { Field **field, *found= 0; minpos= share->reclength; diff --git a/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index c0f2041fddb..d7eeb0a68f7 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.h @@ -148,6 +148,7 @@ public: int assign_to_keycache(THD * thd, HA_CHECK_OPT * check_opt); int preload_keys(THD * thd, HA_CHECK_OPT * check_opt); bool check_if_incompatible_data(HA_CREATE_INFO * info, uint table_changes); + bool check_if_supported_virtual_columns(void) { return TRUE;} #ifdef HAVE_REPLICATION int dump(THD * thd, int fd); int net_read_dump(NET * net); |