mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

compile on mysql 5.6

Browse source
This commit is contained in:
Rich Prohaska 2013-05-08 10:12:02 -04:00
parent e3b729627d
commit 2090a32065
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
storage/tokudb/tokudb_card.h
View file

@ -92,17 +92,18 @@ namespace tokudb {
uint orig_key_parts = 0;
for (uint i = 0; i < table_share->keys; i++) {
orig_key_offset[i] = orig_key_parts;
orig_key_parts += table_share->key_info[i].key_parts;
orig_key_parts += get_key_parts(&table_share->key_info[i]);
}
// if orig card data exists, then use it to compute new card data
if (error == 0) {
uint key_parts = 0;
uint next_key_parts = 0;
for (uint i = 0; error == 0 && i < altered_table_share->keys; i++) {
uint ith_key_parts = get_key_parts(&altered_table_share->key_info[i]);
uint orig_key_index;
if (find_index_of_key(altered_table_share->key_info[i].name, table_share, &orig_key_index)) {
memcpy(&altered_rec_per_key[key_parts], &rec_per_key[orig_key_offset[orig_key_index]], altered_table_share->key_info[i].key_parts);
memcpy(&altered_rec_per_key[next_key_parts], &rec_per_key[orig_key_offset[orig_key_index]], ith_key_parts);
}
key_parts += altered_table_share->key_info[i].key_parts;
next_key_parts += ith_key_parts;
}
}
if (error == 0)