From: Date: October 6 2006 8:03am
Subject: bk commit into 5.0 tree (svoj:1.2291) BUG#10974
List-Archive: http://lists.mysql.com/commits/13217
X-Bug: 10974
Message-Id: <20061006060320.990D9E6F@april.pils.ru>

Below is the list of changes that have just been committed into a local
5.0 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:03:14+05:00, svoj@stripped +1 -0
  Addition to fix for bug#10974. Fixed spelling.

  sql/share/errmsg.txt@stripped, 2006-10-06 11:03:12+05:00, svoj@stripped +1 -1
    Addition to fix for bug#10974. Fixed spelling.

# 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.0-engines

--- 1.73/sql/share/errmsg.txt	2006-10-06 11:03:20 +05:00
+++ 1.74/sql/share/errmsg.txt	2006-10-06 11:03:20 +05:00
@@ -3813,7 +3813,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"