bk commit into 5.1 tree (svoj:1.2343)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.1 repository of svoj. When svoj 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, 2006-10-06 11:09:58+05:00, svoj@april.(none) +2 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines
  MERGE: 1.1810.1697.168

  mysql-test/r/merge.result@stripped, 2006-10-06 11:09:55+05:00, svoj@april.(none) +1 -1
    Manual merge.
    MERGE: 1.43.1.11

  sql/share/errmsg.txt@stripped, 2006-10-06 11:09:55+05:00, svoj@april.(none) +1 -2
    Manual merge.
    MERGE: 1.42.1.32

# 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:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines/RESYNC

--- 1.130/sql/share/errmsg.txt	2006-10-06 11:10:04 +05:00
+++ 1.131/sql/share/errmsg.txt	2006-10-06 11:10:04 +05:00
@@ -3791,7 +3791,7 @@ ER_WRONG_MRG_TABLE  
         cze "V-B¹echny tabulky v MERGE tabulce nejsou definovány stejnì"
         dan "Tabellerne i MERGE er ikke defineret ens"
         nla "Niet alle tabellen in de MERGE tabel hebben identieke gedefinities"
-        eng "Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists"
+        eng "Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist"
         est "Kõik tabelid MERGE tabeli määratluses ei ole identsed"
         fre "Toutes les tables de la table de type MERGE n'ont pas la même définition"
         ger "Nicht alle Tabellen in der MERGE-Tabelle sind gleich definiert"

--- 1.57/mysql-test/r/merge.result	2006-10-06 11:10:05 +05:00
+++ 1.58/mysql-test/r/merge.result	2006-10-06 11:10:05 +05:00
@@ -178,12 +178,12 @@ t3	CREATE TABLE `t3` (
 ) ENGINE=MRG_MyISAM DEFAULT CHARSET=latin1 UNION=(`t1`,`t2`)
 create table t4 (a int not null, b char(10), key(a)) engine=MERGE UNION=(t1,t2);
 select * from t4;
-ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists
+ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist
 alter table t4 add column c int;
-ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists
+ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist
 flush tables;
 select * from t4;
-ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists
+ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist
 create database mysqltest;
 create table mysqltest.t6 (a int not null primary key auto_increment, message char(20));
 create table t5 (a int not null, b char(20), key(a)) engine=MERGE
UNION=(test.t1,mysqltest.t6);
@@ -780,11 +780,11 @@ DROP TABLE t1, t2;
 CREATE TABLE t1(a INT) ENGINE=MEMORY;
 CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t1);
 SELECT * FROM t2;
-ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists
+ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist
 DROP TABLE t1, t2;
 CREATE TABLE t2(a INT) ENGINE=MERGE UNION=(t3);
 SELECT * FROM t2;
-ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exists
+ERROR HY000: Unable to open underlying table which is differently defined or of
non-MyISAM type or doesn't exist
 DROP TABLE t2;
 create table t1 (b bit(1));
 create table t2 (b bit(1));