diff options
| author | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-06-03 12:59:31 +0300 |
| commit | f0b28da6f91cf87804015b5dde4820be040c2de7 (patch) | |
| tree | be04186411dc657ef6bbcbe01267d30f2675c914 /myisam/mi_write.c | |
| parent | 3ede8f6289b53345f44aecffd70c7e291f88186b (diff) | |
| parent | 544f95c45112993df1d31d3eda859dd5e4efff89 (diff) | |
| download | mariadb-git-f0b28da6f91cf87804015b5dde4820be040c2de7.tar.gz | |
merge with 4.0
Diffstat (limited to 'myisam/mi_write.c')
| -rw-r--r-- | myisam/mi_write.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 85bcb8427df..d78a5a1425a 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -399,7 +399,7 @@ int _mi_insert(register MI_INFO *info, register MI_KEYDEF *keyinfo, { DBUG_PRINT("test",("t_length: %d ref_len: %d", t_length,s_temp.ref_length)); - DBUG_PRINT("test",("n_ref_len: %d n_length: %d key: %lx", + DBUG_PRINT("test",("n_ref_len: %d n_length: %d key_pos: %lx", s_temp.n_ref_length,s_temp.n_length,s_temp.key)); } #endif @@ -761,6 +761,7 @@ int _mi_ck_write_tree(register MI_INFO *info, uint keynr, uchar *key, /* typeof(_mi_keys_compare)=qsort_cmp2 */ + static int keys_compare(bulk_insert_param *param, uchar *key1, uchar *key2) { uint not_used; @@ -810,9 +811,10 @@ int _mi_init_bulk_insert(MI_INFO *info) bulk_insert_param *params; uint i, num_keys; ulonglong key_map=0; + DBUG_ENTER("_mi_init_bulk_insert"); if (info->bulk_insert) - return 0; + DBUG_RETURN(0); for (i=num_keys=0 ; i < share->base.keys ; i++) { @@ -824,15 +826,15 @@ int _mi_init_bulk_insert(MI_INFO *info) } } - if (num_keys==0 || num_keys>myisam_bulk_insert_tree_size) - return 0; + if (num_keys==0 || num_keys > myisam_bulk_insert_tree_size) + DBUG_RETURN(0); info->bulk_insert=(TREE *) my_malloc((sizeof(TREE)*share->base.keys+ sizeof(bulk_insert_param)*num_keys),MYF(0)); if (!info->bulk_insert) - return HA_ERR_OUT_OF_MEM; + DBUG_RETURN(HA_ERR_OUT_OF_MEM); params=(bulk_insert_param *)(info->bulk_insert+share->base.keys); for (i=0 ; i < share->base.keys ; i++,key++) @@ -841,7 +843,7 @@ int _mi_init_bulk_insert(MI_INFO *info) { params->info=info; params->keynr=i; - init_tree(& info->bulk_insert[i], + init_tree(&info->bulk_insert[i], myisam_bulk_insert_tree_size / num_keys / 4 + 10, myisam_bulk_insert_tree_size / num_keys, 0, (qsort_cmp2)keys_compare, 0, @@ -851,5 +853,5 @@ int _mi_init_bulk_insert(MI_INFO *info) info->bulk_insert[i].root=0; } - return 0; + DBUG_RETURN(0); } |