bk commit into 5.0 tree (msvensson:1.1966)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1966 05/06/20 14:40:14 msvensson@neptunus.(none) +1 -0
  Merge bk-internal:/home/bk/mysql-5.0
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp

  sql/share/errmsg.txt
    1.35 05/06/20 14:40:13 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-tmp/RESYNC

--- 1.34/sql/share/errmsg.txt	2005-06-20 12:17:27 +02:00
+++ 1.35/sql/share/errmsg.txt	2005-06-20 14:40:13 +02:00
@@ -5355,6 +5355,6 @@
 ER_EXEC_STMT_WITH_OPEN_CURSOR
 	eng "You can't execute a prepared statement which has an open cursor associated with it.
Reset the statement to re-execute it."
 ER_STMT_HAS_NO_OPEN_CURSOR
-	eng "The statement (%d) has no open cursor."
+	eng "The statement (%lu) has no open cursor."
 ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
         eng "Explicit or implicit commit is not allowed in stored function or trigger."