bk commit into 4.1 tree (svoj:1.2557) BUG#10974

[Sergey Vojtovich]

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

  mysql-test/r/merge.result@stripped, 2006-10-06 10:54:46+05:00, svoj@stripped +4 -4
    Addition to fix for bug#10974. Fixed spelling.

  sql/share/english/errmsg.txt@stripped, 2006-10-06 10:54:46+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-4.1-engines

--- 1.152/sql/share/english/errmsg.txt	2006-10-06 10:54:51 +05:00
+++ 1.153/sql/share/english/errmsg.txt	2006-10-06 10:54:51 +05:00
@@ -184,7 +184,7 @@ character-set=latin1
 "INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES",
 "Incorrect column name '%-.100s'",
 "The used storage engine can't index column '%-.64s'",
-"Unable to open underlying table which is differently defined or of non-MyISAM type or
doesn't exists",
+"Unable to open underlying table which is differently defined or of non-MyISAM type or
doesn't exist",
 "Can't write, because of unique constraint, to table '%-.64s'",
 "BLOB/TEXT column '%-.64s' used in key specification without a key length",
 "All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE
instead",

--- 1.42/mysql-test/r/merge.result	2006-10-06 10:54:51 +05:00
+++ 1.43/mysql-test/r/merge.result	2006-10-06 10:54:51 +05:00
@@ -178,9 +178,9 @@ 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
 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);
@@ -775,9 +775,9 @@ 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;