diff options
| author | unknown <timour@mysql.com> | 2004-10-11 10:47:08 +0300 |
|---|---|---|
| committer | unknown <timour@mysql.com> | 2004-10-11 10:47:08 +0300 |
| commit | 81f7ade6627d3ab8f5e1100a97f7a3cd7ff5bad2 (patch) | |
| tree | 2d2171e514f0cdbc83a7e6963ba1e79dae224b27 /sql/ha_myisam.cc | |
| parent | 65ed693681b17414fc001099ee734f36de847f13 (diff) | |
| parent | b0982f2182600b701b74c4dcb474dbfd4d6b45f8 (diff) | |
| download | mariadb-git-81f7ade6627d3ab8f5e1100a97f7a3cd7ff5bad2.tar.gz | |
Merge with implementation of WL#1724.
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/key.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/opt_range.cc:
Manual merge
sql/sql_select.cc:
Manual merge
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 7e86633da89..a738e535f14 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -1538,8 +1538,9 @@ ulonglong ha_myisam::get_auto_increment() mi_flush_bulk_insert(file, table->next_number_index); (void) extra(HA_EXTRA_KEYREAD); - key_copy(key,table,table->next_number_index, - table->next_number_key_offset); + key_copy(key, table->record[0], + table->key_info + table->next_number_index, + table->next_number_key_offset); error=mi_rkey(file,table->record[1],(int) table->next_number_index, key,table->next_number_key_offset,HA_READ_PREFIX_LAST); if (error) |