bk commit into 5.0 tree (monty:1.1816)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1816 05/03/17 01:27:04 monty@stripped +2 -0
  Merge with global tree

  sql/ha_federated.cc
    1.21 05/03/17 01:27:01 monty@stripped +0 -1
    merge

  mysql-test/r/federated.result
    1.9 05/03/17 01:27:01 monty@stripped +0 -0
    merge

# 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:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.8/mysql-test/r/federated.result	2005-03-16 04:49:51 +02:00
+++ 1.9/mysql-test/r/federated.result	2005-03-17 01:27:01 +02:00
@@ -20,16 +20,14 @@
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
 COMMENT='mysql://root@stripped:@/too/many/items/federated/t1';
-ERROR HY000: Can't create table 'this connection string is not in the correct format!
-' (errno: 0)
+ERROR HY000: Can't create table 'connection string is not in the correct format' (errno: 0)
 CREATE TABLE federated.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(32) NOT NULL default ''
     )
 ENGINE="FEDERATED" DEFAULT CHARSET=latin1
 COMMENT='mysql://root@stripped';
-ERROR HY000: Can't create table 'this connection string is not in the correct format!
-' (errno: 0)
+ERROR HY000: Can't create table 'connection string is not in the correct format' (errno: 0)
 CREATE TABLE federated.t1 (
 `id` int(20) NOT NULL,
 `name` varchar(32) NOT NULL default ''

--- 1.20/sql/ha_federated.cc	2005-03-16 04:40:59 +02:00
+++ 1.21/sql/ha_federated.cc	2005-03-17 01:27:01 +02:00
@@ -651,7 +651,7 @@
 
 error:
     my_error(error_num, MYF(0),
-             "this connection string is not in the correct format!\n", 0);
+             "connection string is not in the correct format",0);
     DBUG_RETURN(1);
 
 }