bk commit into 5.1 tree (malff:1.2519)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql 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-06-29 12:12:47-06:00, malff@weblab.(none) +1 -0
  Adjusted tests results

  mysql-test/r/ndb_sp.result@stripped, 2007-06-29 12:12:44-06:00, malff@weblab.(none) +1 -1
    Adjusted test results

diff -Nrup a/mysql-test/r/ndb_sp.result b/mysql-test/r/ndb_sp.result
--- a/mysql-test/r/ndb_sp.result	2007-06-28 11:34:47 -06:00
+++ b/mysql-test/r/ndb_sp.result	2007-06-29 12:12:44 -06:00
@@ -31,7 +31,7 @@ select @test_var;
 10
 alter procedure test_proc1 comment 'new comment';
 show create procedure test_proc1;
-Procedure	sql_mode	Create Procedure	Client_cs	Connection_cl	Database_cl
+Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 test_proc1		CREATE DEFINER=`root`@`localhost` PROCEDURE `test_proc1`(in var_in int)
     COMMENT 'new comment'
 begin