bk commit into 4.1 tree (jimw:1.2489) BUG#13334

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2489 05/10/10 19:39:16 jimw@stripped +3 -0
  Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334)

  sql/mysqld.cc
    1.603 05/10/10 19:39:13 jimw@stripped +2 -1
    Fix minimum value of query_prealloc_size to be the same as its default.

  mysql-test/t/variables.test
    1.52 05/10/10 19:39:13 jimw@stripped +9 -1
    Add new regression test

  mysql-test/r/variables.result
    1.64 05/10/10 19:39:13 jimw@stripped +5 -0
    Add new results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-13334

--- 1.602/sql/mysqld.cc	2005-09-28 17:07:38 -07:00
+++ 1.603/sql/mysqld.cc	2005-10-10 19:39:13 -07:00
@@ -5280,7 +5280,8 @@
    "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,

--- 1.63/mysql-test/r/variables.result	2005-09-01 23:19:38 -07:00
+++ 1.64/mysql-test/r/variables.result	2005-10-10 19:39:13 -07:00
@@ -499,3 +499,8 @@
 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

--- 1.51/mysql-test/t/variables.test	2005-09-01 23:15:59 -07:00
+++ 1.52/mysql-test/t/variables.test	2005-10-10 19:39:13 -07:00
@@ -388,7 +388,6 @@
 select ifnull(@@character_set_results,"really null");
 set names latin1;
 
-# End of 4.1 tests
 
 #
 # Bug #9613: @@have_innodb
@@ -396,3 +395,12 @@
 
 --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