bk commit into 5.0 tree (pem:1.1947)

[pem]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.1947 05/07/15 17:41:42 pem@stripped +2 -0
  Post-review fix: Made test bug9538 test robust.

  mysql-test/t/sp.test
    1.132 05/07/15 17:41:36 pem@stripped +1 -0
    Made test bug9538 test robust.

  mysql-test/r/sp.result
    1.137 05/07/15 17:41:35 pem@stripped +2 -1
    Made test bug9538 test robust.

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/home/pem/work/mysql-5.0

--- 1.136/mysql-test/r/sp.result	2005-07-15 17:24:13 +02:00
+++ 1.137/mysql-test/r/sp.result	2005-07-15 17:41:35 +02:00
@@ -3083,9 +3083,10 @@
 create procedure bug9538()
 set @@sort_buffer_size = 1000000|
 set @x = @@sort_buffer_size|
+set @@sort_buffer_size = 2000000|
 select @@sort_buffer_size|
 @@sort_buffer_size
-262136
+2000000
 call bug9538()|
 select @@sort_buffer_size|
 @@sort_buffer_size

--- 1.131/mysql-test/t/sp.test	2005-07-15 17:24:13 +02:00
+++ 1.132/mysql-test/t/sp.test	2005-07-15 17:41:36 +02:00
@@ -3866,6 +3866,7 @@
   set @@sort_buffer_size = 1000000|
 
 set @x = @@sort_buffer_size|
+set @@sort_buffer_size = 2000000|
 select @@sort_buffer_size|
 call bug9538()|
 select @@sort_buffer_size|