diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-02 01:48:43 +0100 |
| commit | 6a72267d05ba24953345b9fe516d6bff2f77e8eb (patch) | |
| tree | 2cc4962b85af835d461cb0c5c5759ff69ea5b687 /sql/mysql_priv.h | |
| parent | e26804399bf57d20f9bd37aebd143ca225daf3f0 (diff) | |
| parent | 89a208850a714d5653207cffa2d654e86063a7e7 (diff) | |
| download | mariadb-git-6a72267d05ba24953345b9fe516d6bff2f77e8eb.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31177/50-31177
client/mysql.cc:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 47396748da6..4334dedfe4e 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -186,7 +186,7 @@ MY_LOCALE *my_locale_by_number(uint number); #define QUERY_ALLOC_PREALLOC_SIZE 8192 #define TRANS_ALLOC_BLOCK_SIZE 4096 #define TRANS_ALLOC_PREALLOC_SIZE 4096 -#define RANGE_ALLOC_BLOCK_SIZE 2048 +#define RANGE_ALLOC_BLOCK_SIZE 4096 #define ACL_ALLOC_BLOCK_SIZE 1024 #define UDF_ALLOC_BLOCK_SIZE 1024 #define TABLE_ALLOC_BLOCK_SIZE 1024 |