bk commit into 5.0 tree (bell:1.2102)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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.2102 06/04/26 11:13:16 bell@stripped +2 -0
  fixed error message text

  sql/share/errmsg.txt
    1.64 06/04/26 11:13:11 bell@stripped +1 -1
    fixed error message text

  mysql-test/r/view.result
    1.154 06/04/26 11:13:11 bell@stripped +1 -1
    fixed error message text

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-err-5.0

--- 1.63/sql/share/errmsg.txt	2006-04-13 23:12:22 +03:00
+++ 1.64/sql/share/errmsg.txt	2006-04-26 11:13:11 +03:00
@@ -5614,4 +5614,4 @@
 ER_MAX_PREPARED_STMT_COUNT_REACHED 42000
         eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)"
 ER_VIEW_RECURSIVE
-        eng "`%-.64s`.`%-.64s` contain view recursion"
+        eng "`%-.64s`.`%-.64s` contains view recursion"

--- 1.153/mysql-test/r/view.result	2006-04-22 10:54:21 +03:00
+++ 1.154/mysql-test/r/view.result	2006-04-26 11:13:11 +03:00
@@ -2606,7 +2606,7 @@
 drop table t1;
 rename table v2 to t1;
 select * from v1;
-ERROR HY000: `test`.`v1` contain view recursion
+ERROR HY000: `test`.`v1` contains view recursion
 drop view t1, v1;
 create table t1 (a int);
 create function f1() returns int