diff options
| author | heikki@hundin.mysql.fi <> | 2003-06-15 01:04:28 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-06-15 01:04:28 +0300 |
| commit | 4da7f485b75867dbc2ed02054459d1e8050144f3 (patch) | |
| tree | 20d5e35fb0abb5c95cf3a833e58bcd4bf0a1c585 /innobase/pars/pars0opt.c | |
| parent | 8a52c2d20bdb23ef154aa5c6a5980a2d763c9c4e (diff) | |
| download | mariadb-git-4da7f485b75867dbc2ed02054459d1e8050144f3.tar.gz | |
Many files:
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
Diffstat (limited to 'innobase/pars/pars0opt.c')
| -rw-r--r-- | innobase/pars/pars0opt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/innobase/pars/pars0opt.c b/innobase/pars/pars0opt.c index 91083e6fa16..4faf83b47a3 100644 --- a/innobase/pars/pars0opt.c +++ b/innobase/pars/pars0opt.c @@ -1058,7 +1058,6 @@ opt_clust_access( dfield_t* dfield; mem_heap_t* heap; ulint n_fields; - ulint col_no; ulint pos; ulint i; @@ -1093,8 +1092,7 @@ opt_clust_access( plan->clust_map = mem_heap_alloc(heap, n_fields * sizeof(ulint)); for (i = 0; i < n_fields; i++) { - col_no = dict_index_get_nth_col_no(clust_index, i); - pos = dict_index_get_nth_col_pos(index, col_no); + pos = dict_index_get_nth_field_pos(index, clust_index, i); *(plan->clust_map + i) = pos; @@ -1109,7 +1107,8 @@ opt_clust_access( dfield = dtuple_get_nth_field(plan->clust_ref, table->mix_len); - dfield_set_data(dfield, mem_heap_alloc(heap, table->mix_id_len), + dfield_set_data(dfield, mem_heap_alloc(heap, + table->mix_id_len), table->mix_id_len); ut_memcpy(dfield_get_data(dfield), table->mix_id_buf, table->mix_id_len); |