mirror of
https://github.com/MariaDB/server.git
synced 2026-04-23 08:45:33 +02:00
Fix a crash in Innobase with tables with many columns and a range query
Removed all Attic directories. BitKeeper/deleted/.del-myisam.doc~519bb06ecc870298: Delete: Docs/Attic/myisam.doc BitKeeper/deleted/.del-libmysql.c~72949a7043113807: Delete: client/Attic/libmysql.c BitKeeper/deleted/.del-net.c~c18042da6fa4e693: Delete: client/Attic/net.c BitKeeper/deleted/.del-print_defaults.c~362952979aa7b330: Delete: extra/Attic/print_defaults.c BitKeeper/deleted/.del-config-win32.h~65db818ec7e8f21b: Delete: include/Attic/config-win32.h BitKeeper/deleted/.del-m_ctype.h.in~f671e3c2d611ba97: Delete: include/Attic/m_ctype.h.in BitKeeper/deleted/.del-mysql_com.h.in~85b1ea7ced528c32: Delete: include/Attic/mysql_com.h.in BitKeeper/deleted/.del-ft_global.h~fe46fb515f1e375: Delete: myisam/Attic/ft_global.h BitKeeper/deleted/.del-lex_hash.h~14f912771118b50c: Delete: sql/Attic/lex_hash.h BitKeeper/deleted/.del-mini_client.c~9a3778c387d06a81: Delete: sql/Attic/mini_client.c BitKeeper/deleted/.del-mini_client_errors.c~29edad51a5d0b068: Delete: sql/Attic/mini_client_errors.c BitKeeper/deleted/.del-mybinlogdump.cc~5dbdd2bde98d6169: Delete: sql/Attic/mybinlogdump.cc BitKeeper/deleted/.del-net_serv.c~52dabcd773a39e10: Delete: sql/Attic/net_serv.c BitKeeper/deleted/.del-bootstrap-ctype.c~6d2a8cda2d6a35ff: Delete: strings/Attic/bootstrap-ctype.c BitKeeper/deleted/.del-ct_init.c~f0948bdd35ceedc3: Delete: strings/Attic/ct_init.c BitKeeper/deleted/.del-ctype-cp1251.c~cdf74b9168408b3: Delete: strings/Attic/ctype-cp1251.c BitKeeper/deleted/.del-ctype-cp1257.c~732611cbc74aeafc: Delete: strings/Attic/ctype-cp1257.c BitKeeper/deleted/.del-ctype-croat.c~d2d805ee6f10cbcc: Delete: strings/Attic/ctype-croat.c BitKeeper/deleted/.del-ctype-danish.c~dc5451066eb272ae: Delete: strings/Attic/ctype-danish.c BitKeeper/deleted/.del-ctype-dec8.c~68f257dd2202d0c7: Delete: strings/Attic/ctype-dec8.c BitKeeper/deleted/.del-ctype-dos.c~f77bd08acf13a8c1: Delete: strings/Attic/ctype-dos.c BitKeeper/deleted/.del-ctype-estonia.c~fc8a69424f7cb66b: Delete: strings/Attic/ctype-estonia.c BitKeeper/deleted/.del-ctype-german1.c~f7830c509bb358f7: Delete: strings/Attic/ctype-german1.c BitKeeper/deleted/.del-ctype-greek.c~90acdff1195209ca: Delete: strings/Attic/ctype-greek.c BitKeeper/deleted/.del-ctype-hebrew.c~d3b4a000d51e76dc: Delete: strings/Attic/ctype-hebrew.c BitKeeper/deleted/.del-ctype-hp8.c~749e1be0f028d349: Delete: strings/Attic/ctype-hp8.c BitKeeper/deleted/.del-ctype-hungarian.c~5cf0bf7fa0312637: Delete: strings/Attic/ctype-hungarian.c BitKeeper/deleted/.del-ctype-koi8_ru.c~8ff4188c642c9bd: Delete: strings/Attic/ctype-koi8_ru.c BitKeeper/deleted/.del-ctype-koi8_ukr.c~a04aa14a6d62335a: Delete: strings/Attic/ctype-koi8_ukr.c BitKeeper/deleted/.del-ctype-latin1.c~cc63880f19c2303e: Delete: strings/Attic/ctype-latin1.c BitKeeper/deleted/.del-ctype-latin2.c~31895c4b83654342: Delete: strings/Attic/ctype-latin2.c BitKeeper/deleted/.del-ctype-swe7.c~bb1b012225d7d02c: Delete: strings/Attic/ctype-swe7.c BitKeeper/deleted/.del-ctype-usa7.c~d19d859dca5675f: Delete: strings/Attic/ctype-usa7.c BitKeeper/deleted/.del-ctype-win1250.c~1ce7a24255780a1: Delete: strings/Attic/ctype-win1250.c BitKeeper/deleted/.del-ctype-win1251.c~762607f4fd7d52ad: Delete: strings/Attic/ctype-win1251.c BitKeeper/deleted/.del-ctype-win1251ukr.c~b5a7cca889bbef58: Delete: strings/Attic/ctype-win1251ukr.c BitKeeper/deleted/.del-ctype.c.in~8bf48d4bcbc5f675: Delete: strings/Attic/ctype.c.in BitKeeper/deleted/.del-memory.h~450f586e82a26d99: Delete: strings/Attic/memory.h BitKeeper/deleted/.del-ptr_cmp.c~57e682a26e769597: Delete: strings/Attic/ptr_cmp.c BitKeeper/deleted/.del-my-example.cnf.sh~87a7e1f4d24b62a9: Delete: support-files/Attic/my-example.cnf.sh BitKeeper/deleted/.del-my-huge.cfg.sh~589bdcd2d2c4360b: Delete: support-files/Attic/my-huge.cfg.sh BitKeeper/deleted/.del-my-large.cfg.sh~842c8e76253c9396: Delete: support-files/Attic/my-large.cfg.sh BitKeeper/deleted/.del-my-medium.cfg.sh~c49880d26ef0648e: Delete: support-files/Attic/my-medium.cfg.sh BitKeeper/deleted/.del-my-small.cfg.sh~85023c559a1d96c: Delete: support-files/Attic/my-small.cfg.sh sql/ha_innobase.cc: Fix a crash with tables with many columns and a range query: memory corruption occurred Docs/manual.texi: Changelog mysql-test/r/innobase.result: New test case for innobase scripts/mysql_install_db.sh: Fixed typo sql/ha_berkeley.h: Fixed that 'have_bdb' is disabled if we can't initialize bdb sql/ha_gemini.cc: Removed include file that got compiliation to fail on some systems sql/handler.cc: Fixed that 'have_tabltype' is disabled if we can't initialize it. sql/mysqld.cc: Fix bug that could cause a fast connect/close to fail when using --debug
This commit is contained in:
parent
f51f598538
commit
219682ef86
52 changed files with 15 additions and 10901 deletions
|
|
@ -1,39 +0,0 @@
|
|||
# Example mysql config file.
|
||||
# You can copy this to one of:
|
||||
# @sysconfdir@/my.cnf to set global options,
|
||||
# mysql-data-dir/my.cnf to set server-specific options (in this
|
||||
# installation this directory is @localstatedir@) or
|
||||
# ~/.my.cnf to set user-specific options.
|
||||
#
|
||||
# One can use all long options that the program supports.
|
||||
# Run the program with --help to get a list of available options
|
||||
|
||||
# This will be passed to all mysql clients
|
||||
[client]
|
||||
#password = my_password
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
|
||||
# Here is entries for some specific programs
|
||||
# The following values assume you have at least 32M ram
|
||||
|
||||
# The MySQL server
|
||||
[mysqld]
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
skip-locking
|
||||
set-variable = key_buffer=16M
|
||||
set-variable = max_allowed_packet=1M
|
||||
set-variable = thread_stack=128K
|
||||
# Start logging
|
||||
log
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
set-variable = max_allowed_packet=16M
|
||||
|
||||
[mysql]
|
||||
no-auto-rehash
|
||||
|
||||
[isamchk]
|
||||
set-variable = key_buffer=16M
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
# Example mysql config file for very large systems.
|
||||
#
|
||||
# This is for large system with memory of 1G-2G where the system runs mainly
|
||||
# MySQL.
|
||||
#
|
||||
# You can copy this file to
|
||||
# /etc/mf.cnf to set global options,
|
||||
# mysql-data-dir/my.cnf to set server-specific options (in this
|
||||
# installation this directory is @localstatedir@) or
|
||||
# ~/.my.cnf to set user-specific options.
|
||||
#
|
||||
# One can in this file use all long options that the program supports.
|
||||
# If you want to know which options a program support, run the program
|
||||
# with --help option.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
|
||||
# Here follows entries for some specific programs
|
||||
|
||||
# The MySQL server
|
||||
[mysqld]
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
#tmpdir = /tmp/ # Put this on a dedicated disk
|
||||
skip-locking
|
||||
set-variable = key_buffer=512M
|
||||
set-variable = max_allowed_packet=1M
|
||||
set-variable = table_cache=512
|
||||
set-variable = sort_buffer=2M
|
||||
set-variable = record_buffer=2M
|
||||
set-variable = thread_cache=8
|
||||
set-variable = thread_concurrency=8 # Try number of CPU's*2
|
||||
set-variable = myisam_sort_buffer_size=64M
|
||||
#set-variable = bdb_cache_size=256M
|
||||
# Only log updates
|
||||
log-update
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
set-variable = max_allowed_packet=16M
|
||||
|
||||
[mysql]
|
||||
no-auto-rehash
|
||||
#safe-updates # Remove the comment character if you are not familiar with SQL
|
||||
|
||||
[isamchk]
|
||||
set-variable = key_buffer=256M
|
||||
set-variable = sort_buffer=256M
|
||||
set-variable = read-buffer=2M
|
||||
set-variable = write-buffer=2M
|
||||
|
||||
[myisamchk]
|
||||
set-variable = key_buffer=256M
|
||||
set-variable = sort_buffer=256M
|
||||
set-variable = read-buffer=2M
|
||||
set-variable = write-buffer=2M
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
# Example mysql config file for large systems.
|
||||
#
|
||||
# This is for large system with memory = 512M where the system runs mainly
|
||||
# MySQL.
|
||||
#
|
||||
# You can copy this file to
|
||||
# /etc/mf.cnf to set global options,
|
||||
# mysql-data-dir/my.cnf to set server-specific options (in this
|
||||
# installation this directory is @localstatedir@) or
|
||||
# ~/.my.cnf to set user-specific options.
|
||||
#
|
||||
# One can in this file use all long options that the program supports.
|
||||
# If you want to know which options a program support, run the program
|
||||
# with --help option.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
|
||||
# Here follows entries for some specific programs
|
||||
|
||||
# The MySQL server
|
||||
[mysqld]
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
#tmpdir = /tmp/ # Put this on a dedicated disk
|
||||
skip-locking
|
||||
set-variable = key_buffer=256M
|
||||
set-variable = max_allowed_packet=1M
|
||||
set-variable = table_cache=256
|
||||
set-variable = sort_buffer=1M
|
||||
set-variable = record_buffer=1M
|
||||
set-variable = myisam_sort_buffer_size=64M
|
||||
set-variable = thread_cache=8
|
||||
set-variable = thread_concurrency=8 # Try number of CPU's*2
|
||||
#set-variable = bdb_cache_size=64M
|
||||
# Only log updates
|
||||
log-update
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
set-variable = max_allowed_packet=16M
|
||||
|
||||
[mysql]
|
||||
no-auto-rehash
|
||||
#safe-updates # Remove the comment character if you are not familiar with SQL
|
||||
|
||||
[isamchk]
|
||||
set-variable = key_buffer=128M
|
||||
set-variable = sort_buffer=128M
|
||||
set-variable = read-buffer=2M
|
||||
set-variable = write-buffer=2M
|
||||
|
||||
[myisamchk]
|
||||
set-variable = key_buffer=128M
|
||||
set-variable = sort_buffer=128M
|
||||
set-variable = read-buffer=2M
|
||||
set-variable = write-buffer=2M
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
# Example mysql config file for medium systems.
|
||||
#
|
||||
# This is for a system with little memory (32M - 64M) where MySQL plays
|
||||
# a important part and systems up to 128M very MySQL is used together with
|
||||
# other programs (like a web server)
|
||||
#
|
||||
# You can copy this file to
|
||||
# /etc/mf.cnf to set global options,
|
||||
# mysql-data-dir/my.cnf to set server-specific options (in this
|
||||
# installation this directory is @localstatedir@) or
|
||||
# ~/.my.cnf to set user-specific options.
|
||||
#
|
||||
# One can in this file use all long options that the program supports.
|
||||
# If you want to know which options a program support, run the program
|
||||
# with --help option.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
|
||||
# Here follows entries for some specific programs
|
||||
|
||||
# The MySQL server
|
||||
[mysqld]
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
#tmpdir = /tmp/ # Put this on a dedicated disk
|
||||
skip-locking
|
||||
set-variable = key_buffer=16M
|
||||
set-variable = max_allowed_packet=1M
|
||||
set-variable = table_cache=64
|
||||
set-variable = sort_buffer=512K
|
||||
set-variable = net_buffer_length=8K
|
||||
set-variable = myisam_sort_buffer_size=8M
|
||||
#set-variable = bdb_cache_size=1M
|
||||
log-update
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
set-variable = max_allowed_packet=16M
|
||||
|
||||
[mysql]
|
||||
no-auto-rehash
|
||||
#safe-updates # Remove the comment character if you are not familiar with SQL
|
||||
|
||||
[isamchk]
|
||||
set-variable = key_buffer=20M
|
||||
set-variable = sort_buffer=20M
|
||||
set-variable = read-buffer=2M
|
||||
set-variable = write-buffer=2M
|
||||
|
||||
[myisamchk]
|
||||
set-variable = key_buffer=20M
|
||||
set-variable = sort_buffer=20M
|
||||
set-variable = read-buffer=2M
|
||||
set-variable = write-buffer=2M
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
# Example mysql config file for small systems.
|
||||
#
|
||||
# This is for a system with little memory (<= 64M) where MySQL is only used
|
||||
# from time to time and it's important that the mysqld deamon
|
||||
# doesn't use much resources.
|
||||
#
|
||||
# You can copy this file to
|
||||
# /etc/mf.cnf to set global options,
|
||||
# mysql-data-dir/my.cnf to set server-specific options (in this
|
||||
# installation this directory is @localstatedir@) or
|
||||
# ~/.my.cnf to set user-specific options.
|
||||
#
|
||||
# One can in this file use all long options that the program supports.
|
||||
# If you want to know which options a program support, run the program
|
||||
# with --help option.
|
||||
|
||||
# The following options will be passed to all MySQL clients
|
||||
[client]
|
||||
#password = your_password
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
|
||||
# Here follows entries for some specific programs
|
||||
|
||||
# The MySQL server
|
||||
[mysqld]
|
||||
port = @MYSQL_TCP_PORT@
|
||||
socket = @MYSQL_UNIX_ADDR@
|
||||
skip-locking
|
||||
set-variable = key_buffer=16K
|
||||
set-variable = max_allowed_packet=1M
|
||||
set-variable = thread_stack=64K
|
||||
set-variable = table_cache=4
|
||||
set-variable = sort_buffer=64K
|
||||
set-variable = net_buffer_length=2K
|
||||
# Don't log things
|
||||
#log
|
||||
|
||||
[mysqldump]
|
||||
quick
|
||||
set-variable = max_allowed_packet=16M
|
||||
|
||||
[mysql]
|
||||
no-auto-rehash
|
||||
#safe-updates # Remove the comment character if you are not familiar with SQL
|
||||
|
||||
[isamchk]
|
||||
set-variable = key_buffer=8M
|
||||
set-variable = sort_buffer=8M
|
||||
|
||||
[myisamchk]
|
||||
set-variable = key_buffer=8M
|
||||
set-variable = sort_buffer=8M
|
||||
Loading…
Add table
Add a link
Reference in a new issue