summaryrefslogtreecommitdiff
path: root/sql/sql_sort.h
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2001-07-10 15:53:08 +0300
committerunknown <monty@tik.mysql.fi>2001-07-10 15:53:08 +0300
commit9914a0c8471b9ee1f041b13c11211fe277cfcd91 (patch)
tree6c8e56d350fb233a41c963d85544d41c0151c8ec /sql/sql_sort.h
parent0b083a0d766bbc25e2b1264dd41a421703ac581f (diff)
downloadmariadb-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/sql_sort.h')
-rw-r--r--sql/sql_sort.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_sort.h b/sql/sql_sort.h
index 498a5262b53..62c5f1cb164 100644
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@@ -37,6 +37,7 @@ typedef struct st_sort_param {
SORT_FIELD *local_sortorder;
SORT_FIELD *end;
uchar *unique_buff;
+ bool not_killable;
#ifdef USE_STRCOLL
char* tmp_buffer;
#endif