diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-22 01:19:05 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-22 01:19:05 +0300 |
| commit | da12c768d31b33cc9ab69f5efc1e7f754c1dfade (patch) | |
| tree | 50bd20246c62aa9e57f6afc0a26f08cb1f3d0396 /myisam/sort.c | |
| parent | 94c93b9ec7f68ba50219818caec23e61f85b800d (diff) | |
| download | mariadb-git-da12c768d31b33cc9ab69f5efc1e7f754c1dfade.tar.gz | |
Give an error if you use a BLOB(X) where X > 255
Fixes for MIT pthreads
Docs/manual.texi:
Update for MIT pthreads and sockets
configure.in:
Fixed MIT pthreads to use sockets
myisam/mi_check.c:
Portability fix
myisam/sort.c:
Portability fix
sql/handler.h:
Give an error if you use a BLOB(X) where X > 255
sql/mysqld.cc:
Fixed MIT pthreads to use sockets
sql/sql_table.cc:
Give an error if you use a BLOB(X) where X > 255
sql/table.cc:
Fixed problem with BDB tables without keys
Diffstat (limited to 'myisam/sort.c')
| -rw-r--r-- | myisam/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/sort.c b/myisam/sort.c index a2a28ec9109..e6c7d61e39a 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -291,9 +291,9 @@ static int NEAR_F merge_many_buff(MI_SORT_PARAM *info, uint keys, temp=from_file; from_file=to_file; to_file=temp; *maxbuffer= (int) (lastbuff-buffpek)-1; } - close_cached_file(to_file); // This holds old result + close_cached_file(to_file); /* This holds old result */ if (to_file == t_file) - *t_file=t_file2; // Copy result file + *t_file=t_file2; /* Copy result file */ DBUG_RETURN(*maxbuffer >= MERGEBUFF2); /* Return 1 if interrupted */ } /* merge_many_buff */ |