bk commit into 5.1 tree (istruewing:1.2599)

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-10-30 12:03:44+01:00, istruewing@stripped +1 -0
  Post-merge fix

  mysql-test/t/variables.test@stripped, 2007-10-30 12:03:43+01:00, istruewing@stripped +1 -1
    Post-merge fix

diff -Nrup a/mysql-test/t/variables.test b/mysql-test/t/variables.test
--- a/mysql-test/t/variables.test	2007-10-04 11:07:03 +02:00
+++ b/mysql-test/t/variables.test	2007-10-30 12:03:43 +01:00
@@ -161,7 +161,7 @@ select * from information_schema.session
 set net_buffer_length=1;
 show variables like 'net_buffer_length';
 select * from information_schema.session_variables where variable_name like 'net_buffer_length';
---warning 1292
+#warning 1292
 set net_buffer_length=2000000000;
 show variables like 'net_buffer_length';
 select * from information_schema.session_variables where variable_name like 'net_buffer_length';