diff options
| author | unknown <monty@mysql.com> | 2004-05-10 17:38:05 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-10 17:38:05 +0300 |
| commit | 508b8f0a4187beab2d788c30c318814dde4bd543 (patch) | |
| tree | 16b23b0f2b4e288cc29a703824845d64d3325e0b | |
| parent | e13340b0a2aa93bfa2c3d3c2e0fde041419a737c (diff) | |
| parent | 3fd7554f06af54681e53595be52c30ae8462250c (diff) | |
| download | mariadb-git-508b8f0a4187beab2d788c30c318814dde4bd543.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
| -rw-r--r-- | include/violite.h | 10 | ||||
| -rw-r--r-- | support-files/my-huge.cnf.sh | 1 | ||||
| -rw-r--r-- | support-files/my-large.cnf.sh | 1 | ||||
| -rw-r--r-- | support-files/my-medium.cnf.sh | 2 | ||||
| -rw-r--r-- | support-files/my-small.cnf.sh | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/include/violite.h b/include/violite.h index e8f30288d34..b4b9f724d89 100644 --- a/include/violite.h +++ b/include/violite.h @@ -55,14 +55,8 @@ int vio_close_pipe(Vio * vio); void vio_delete(Vio* vio); int vio_close(Vio* vio); - -#ifdef EMBEDDED_LIBRARY -void vio_reset(Vio *vio); -#else -void vio_reset(Vio* vio, enum enum_vio_type type, - my_socket sd, HANDLE hPipe, my_bool localhost); -#endif - +void vio_reset(Vio* vio, enum enum_vio_type type, + my_socket sd, HANDLE hPipe, my_bool localhost); int vio_read(Vio *vio, gptr buf, int size); int vio_write(Vio *vio, const gptr buf, int size); int vio_blocking(Vio *vio, my_bool onoff, my_bool *old_mode); diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index ba92856df0e..5fdde0d2963 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -31,6 +31,7 @@ max_allowed_packet = 1M table_cache = 512 sort_buffer_size = 2M read_buffer_size = 2M +read_rnd_buffer_size = 8M myisam_sort_buffer_size = 64M thread_cache = 8 query_cache_size = 32M diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh index ba865a5bfd0..a17ec7b5227 100644 --- a/support-files/my-large.cnf.sh +++ b/support-files/my-large.cnf.sh @@ -31,6 +31,7 @@ max_allowed_packet = 1M table_cache = 256 sort_buffer_size = 1M read_buffer_size = 1M +read_rnd_buffer_size = 4M myisam_sort_buffer_size = 64M thread_cache = 8 query_cache_size= 16M diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh index 4650ed06dc1..d50d0717c17 100644 --- a/support-files/my-medium.cnf.sh +++ b/support-files/my-medium.cnf.sh @@ -32,6 +32,8 @@ max_allowed_packet = 1M table_cache = 64 sort_buffer_size = 512K net_buffer_length = 8K +read_buffer_size = 256K +read_rnd_buffer_size = 512K myisam_sort_buffer_size = 8M # Don't listen on a TCP/IP port at all. This can be a security enhancement, diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh index ca26a10a397..2ae62fb48f1 100644 --- a/support-files/my-small.cnf.sh +++ b/support-files/my-small.cnf.sh @@ -31,6 +31,8 @@ key_buffer = 16K max_allowed_packet = 1M table_cache = 4 sort_buffer_size = 64K +read_buffer_size = 256K +read_rnd_buffer_size = 256K net_buffer_length = 2K thread_stack = 64K |