diff options
| author | unknown <monty@tik.mysql.fi> | 2001-07-10 15:53:08 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2001-07-10 15:53:08 +0300 |
| commit | 9914a0c8471b9ee1f041b13c11211fe277cfcd91 (patch) | |
| tree | 6c8e56d350fb233a41c963d85544d41c0151c8ec /myisam | |
| parent | 0b083a0d766bbc25e2b1264dd41a421703ac581f (diff) | |
| download | mariadb-git-9914a0c8471b9ee1f041b13c11211fe277cfcd91.tar.gz | |
Redefinition of myisam_bulk_insert_tree_size
Removed new error message
Fixed test case for varbinary
Threads are again killable in "merge_buffers"
Cleanup of sql_repl.cc
SHOW OPEN TABLES now works when no tables are opened
Docs/manual.texi:
Redefinition of myisam_bulk_insert_tree_size
client/insert_test.c:
Changed to use mysql_real_connect()
include/mysql.h:
Moved things in mysql_options to optimize these for 64 bit processors
include/mysqld_error.h:
Removed new error message
myisam/mi_write.c:
Use myisam_bulk_insert_tree_size per table instead of per index
mysql-test/t/varbinary.test:
Fixed test case for varbinary
mysys/tree.c:
Fixed missing if
sql/filesort.cc:
Threads are again killable in "merge_buffers"
sql/log_event.h:
cleanup
sql/share/czech/errmsg.txt:
Removed new error message
sql/share/danish/errmsg.txt:
Removed new error message
sql/share/dutch/errmsg.txt:
Removed new error message
sql/share/english/errmsg.txt:
Removed new error message
sql/share/estonian/errmsg.txt:
Removed new error message
sql/share/french/errmsg.txt:
Removed new error message
sql/share/german/errmsg.txt:
Removed new error message
sql/share/greek/errmsg.txt:
Removed new error message
sql/share/hungarian/errmsg.txt:
Removed new error message
sql/share/italian/errmsg.txt:
Removed new error message
sql/share/japanese/errmsg.txt:
Removed new error message
sql/share/korean/errmsg.txt:
Removed new error message
sql/share/norwegian-ny/errmsg.txt:
Removed new error message
sql/share/norwegian/errmsg.txt:
Removed new error message
sql/share/polish/errmsg.txt:
Removed new error message
sql/share/portuguese/errmsg.txt:
Removed new error message
sql/share/romanian/errmsg.txt:
Removed new error message
sql/share/russian/errmsg.txt:
Removed new error message
sql/share/slovak/errmsg.txt:
Removed new error message
sql/share/spanish/errmsg.txt:
Removed new error message
sql/share/swedish/errmsg.txt:
Removed new error message
sql/sql_class.h:
Cleanup
sql/sql_delete.cc:
Cleanup
sql/sql_repl.cc:
Cleanup
sql/sql_show.cc:
SHOW OPEN TABLES now works when no tables are opened
sql/sql_sort.h:
Threads are again killable in "merge_buffers"
sql/uniques.cc:
Threads are again killable in "merge_buffers"
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_write.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 5624e0ac44c..085490649a8 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -770,8 +770,9 @@ int _mi_init_bulk_insert(MI_INFO *info) if (info->bulk_insert) return 0; - info->bulk_insert=(TREE *)my_malloc( - (sizeof(TREE)+sizeof(bulk_insert_param))*share->base.keys, MYF(0)); + info->bulk_insert=(TREE *) + my_malloc((sizeof(TREE)+sizeof(bulk_insert_param))*share->base.keys, + MYF(0)); if (!info->bulk_insert) return HA_ERR_OUT_OF_MEM; @@ -785,9 +786,10 @@ int _mi_init_bulk_insert(MI_INFO *info) if (!(key->flag & HA_NOSAME) && share->base.auto_key != i+1 && test(share->state.key_map & ((ulonglong) 1 << i))) { - init_tree(& info->bulk_insert[i], 0, myisam_bulk_insert_tree_size, 0, - (qsort_cmp2)keys_compare, 0, - (tree_element_free) keys_free, (void *)params); + init_tree(& info->bulk_insert[i], 0, + myisam_bulk_insert_tree_size / share->base.keys, 0, + (qsort_cmp2)keys_compare, 0, + (tree_element_free) keys_free, (void *)params); } else info->bulk_insert[i].root=0; |