bk commit into 5.1 tree (jonas:1.1998)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.1998 06/01/10 11:31:27 jonas@stripped +2 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
  into  perch.ndb.mysql.com:/home/jonas/src/51-dd

  sql/share/errmsg.txt
    1.57 06/01/10 11:31:23 jonas@stripped +0 -0
    Auto merged

  sql/log.cc
    1.183 06/01/10 11:31:23 jonas@stripped +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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-dd/RESYNC

--- 1.182/sql/log.cc	2006-01-04 16:27:58 +01:00
+++ 1.183/sql/log.cc	2006-01-10 11:31:23 +01:00
@@ -2561,7 +2561,7 @@
 #endif
 
   Table_map_log_event::flag_set const
-    flags= Table_map_log_event::NO_FLAGS;
+    flags= Table_map_log_event::TM_NO_FLAGS;
 
   Table_map_log_event
     the_event(thd, table, table->s->table_map_id, is_transactional, flags);

--- 1.56/sql/share/errmsg.txt	2006-01-04 16:27:59 +01:00
+++ 1.57/sql/share/errmsg.txt	2006-01-10 11:31:23 +01:00
@@ -5190,8 +5190,8 @@
 	eng "Failed to ALTER %s %s"
 	ger "ALTER %s %s fehlgeschlagen"
 ER_SP_SUBSELECT_NYI 0A000 
-	eng "Subselect value not supported"
-	ger "Subselect-Wert wird nicht unterstützt"
+	eng "Subquery value not supported"
+	ger "Subquery-Wert wird nicht unterstützt"
 ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG 0A000
         eng "%s is not allowed in stored function or trigger"
 	ger "%s ist in gespeicherten Funktionen und in Triggern nicht erlaubt"