bk commit into 5.1 tree (msvensson:1.2533)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-04 17:15:31+01:00, msvensson@stripped +2 -0
  Remove extra ;
  Remove include/big_test.inc, its not big and we need to test this

  mysql-test/r/federated_server.result@stripped, 2007-12-04 17:15:29+01:00, msvensson@stripped +1 -1
    Update result file to reflect test 

  mysql-test/t/federated_server.test@stripped, 2007-12-04 17:15:29+01:00, msvensson@stripped +1 -2
    Remove extra ;
    Remove include/big_test.inc, its not big and we need to test this

diff -Nrup a/mysql-test/r/federated_server.result b/mysql-test/r/federated_server.result
--- a/mysql-test/r/federated_server.result	2007-04-04 23:35:54 +02:00
+++ b/mysql-test/r/federated_server.result	2007-12-04 17:15:29 +01:00
@@ -262,7 +262,7 @@ DECLARE e INT DEFAULT 0;
 DECLARE i INT;
 DECLARE CONTINUE HANDLER FOR SQLEXCEPTION SET e = e + 1;
 SET i = sleep(5);
-WHILE v < 20000 do
+WHILE v < 10000 do
 CREATE SERVER s
 FOREIGN DATA WRAPPER mysql
 OPTIONS (USER 'Remote', HOST '192.168.1.106', DATABASE 'test');
diff -Nrup a/mysql-test/t/federated_server.test b/mysql-test/t/federated_server.test
--- a/mysql-test/t/federated_server.test	2007-04-17 13:41:14 +02:00
+++ b/mysql-test/t/federated_server.test	2007-12-04 17:15:29 +01:00
@@ -2,8 +2,7 @@
 # if federated can utilise the servers table
 # should work with embedded server after mysqltest is fixed
 -- source include/not_embedded.inc
--- source include/federated.inc;
--- source include/big_test.inc
+-- source include/federated.inc
 
 connection slave;
 create database first_db;