bk commit into 5.1 tree (sven:1.2660)

[Sven Sandberg]

Below is the list of changes that have just been committed into a local
5.1 repository of sven. When sven 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@stripped, 2007-12-18 18:06:58+01:00, sven@riska.(none) +2 -0
  undo previous automerge

  BitKeeper/deleted/.del-sp_trans_log.result@stripped, 2007-12-18 18:06:57+01:00, sven@riska.(none) +0 -1
    undo previous automerge

  mysql-test/r/variables-big.result@stripped, 2007-12-18 18:06:57+01:00, sven@riska.(none) +4 -8
    undo previous automerge

diff -Nrup a/mysql-test/r/variables-big.result b/mysql-test/r/variables-big.result
--- a/mysql-test/r/variables-big.result	2007-12-18 17:31:13 +01:00
+++ b/mysql-test/r/variables-big.result	2007-12-18 18:06:57 +01:00
@@ -1,7 +1,7 @@
 set session transaction_prealloc_size=1024*1024*1024*1;
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+1	root	localhost	test	Query	0	NULL	show processlist
 set session transaction_prealloc_size=1024*1024*1024*2;
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
@@ -9,16 +9,12 @@ Id	User	Host	db	Command	Time	State	Info
 set session transaction_prealloc_size=1024*1024*1024*3;
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+1	root	localhost	test	Query	0	NULL	show processlist
 set session transaction_prealloc_size=1024*1024*1024*4;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '4294967296'
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+1	root	localhost	test	Query	0	NULL	show processlist
 set session transaction_prealloc_size=1024*1024*1024*5;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '5368709120'
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
-6	root	localhost	test	Query	0	NULL	show processlist
+1	root	localhost	test	Query	0	NULL	show processlist