diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-05 22:56:11 +0300 |
| commit | d042146e5b41b6222df3e6b4c16a44f3ef2939b7 (patch) | |
| tree | e40f5b435f7d17ed1c24dfb787ab8cd5f4f7d5d8 /storage/myisammrg | |
| parent | 3e610bc58d0ba325fdca3b06dfa976ecc513dc1e (diff) | |
| parent | f0f21036951f6fed2fddeb58375425f957751fd5 (diff) | |
| download | mariadb-git-d042146e5b41b6222df3e6b4c16a44f3ef2939b7.tar.gz | |
Merge with MariaDB 5.1.49
Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
Diffstat (limited to 'storage/myisammrg')
| -rw-r--r-- | storage/myisammrg/ha_myisammrg.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisammrg/ha_myisammrg.cc b/storage/myisammrg/ha_myisammrg.cc index f27f22761b1..c6e5c24590a 100644 --- a/storage/myisammrg/ha_myisammrg.cc +++ b/storage/myisammrg/ha_myisammrg.cc @@ -1134,8 +1134,8 @@ void ha_myisammrg::update_create_info(HA_CREATE_INFO *create_info) goto err; create_info->merge_list.elements++; - (*create_info->merge_list.next) = (uchar*) ptr; - create_info->merge_list.next= (uchar**) &ptr->next_local; + (*create_info->merge_list.next) = ptr; + create_info->merge_list.next= &ptr->next_local; } *create_info->merge_list.next=0; } @@ -1157,7 +1157,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form, { char buff[FN_REFLEN]; const char **table_names, **pos; - TABLE_LIST *tables= (TABLE_LIST*) create_info->merge_list.first; + TABLE_LIST *tables= create_info->merge_list.first; THD *thd= current_thd; size_t dirlgt= dirname_length(name); DBUG_ENTER("ha_myisammrg::create"); |