diff options
| author | unknown <jimw@mysql.com> | 2005-10-18 09:45:12 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-10-18 09:45:12 -0700 |
| commit | c7c802aa264a94eb1ab3c7aea98e9c6ef0023131 (patch) | |
| tree | c8c0605458731214fd0bdc1602db4e07072a640f | |
| parent | 592fdcc7e60a7797c48343e2e0d9484244f7c8ac (diff) | |
| parent | 31756a6aa4bb5a2e29269721d29c3a148ad29347 (diff) | |
| download | mariadb-git-c7c802aa264a94eb1ab3c7aea98e9c6ef0023131.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-13334
into mysql.com:/home/jimw/my/mysql-4.1-clean
sql/mysqld.cc:
Auto merged
| -rw-r--r-- | mysql-test/r/variables.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 10 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 67c78d82a24..0aa7ea7f83c 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -499,3 +499,8 @@ set names latin1; select @@have_innodb; @@have_innodb # +set @test = @@query_prealloc_size; +set @@query_prealloc_size = @test; +select @@query_prealloc_size = @test; +@@query_prealloc_size = @test +1 diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index a8844070207..8322c0f84bd 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -388,7 +388,6 @@ set character_set_results=NULL; select ifnull(@@character_set_results,"really null"); set names latin1; -# End of 4.1 tests # # Bug #9613: @@have_innodb @@ -396,3 +395,12 @@ set names latin1; --replace_column 1 # select @@have_innodb; + +# +# Bug #13334: query_prealloc_size default less than minimum +# +set @test = @@query_prealloc_size; +set @@query_prealloc_size = @test; +select @@query_prealloc_size = @test; + +# End of 4.1 tests diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e1e87652255..d21de9b7780 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5349,7 +5349,8 @@ The minimum value for this variable is 4096.", "Persistent buffer for query parsing and execution", (gptr*) &global_system_variables.query_prealloc_size, (gptr*) &max_system_variables.query_prealloc_size, 0, GET_ULONG, - REQUIRED_ARG, QUERY_ALLOC_PREALLOC_SIZE, 16384, ~0L, 0, 1024, 0}, + REQUIRED_ARG, QUERY_ALLOC_PREALLOC_SIZE, QUERY_ALLOC_PREALLOC_SIZE, + ~0L, 0, 1024, 0}, {"range_alloc_block_size", OPT_RANGE_ALLOC_BLOCK_SIZE, "Allocation block size for storing ranges during optimization", (gptr*) &global_system_variables.range_alloc_block_size, |