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 /sql/uniques.cc | |
| 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 'sql/uniques.cc')
| -rw-r--r-- | sql/uniques.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/uniques.cc b/sql/uniques.cc index 5ef7ead276b..ee1da0f661b 100644 --- a/sql/uniques.cc +++ b/sql/uniques.cc @@ -128,10 +128,12 @@ bool Unique::get(TABLE *table) return 1; reinit_io_cache(outfile,WRITE_CACHE,0L,0,0); + bzero((char*) &sort_param,sizeof(sort_param)); sort_param.max_rows= elements; sort_param.sort_form=table; sort_param.sort_length=sort_param.ref_length=tree.size_of_element; sort_param.keys= max_in_memory_size / sort_param.sort_length; + sort_param.not_killable=1; if (!(sort_buffer=(uchar*) my_malloc((sort_param.keys+1) * sort_param.sort_length, |