Commit 6c8c4fda authored by unknown's avatar unknown
Browse files

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
parents 1b05f7da 4c3f3bd8

mysql-test/r/variables.result

+5 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/variables.test

+9 −1
Original line number Diff line number Diff line
@@ -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

sql/mysqld.cc

+2 −1
Original line number Diff line number Diff line
@@ -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,