Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1


dbug/dbug.c:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_servers.cc:
  Auto merged
sql/sql_servers.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
support-files/Makefile.am:
  Auto merged
sql/opt_range.cc:
  manual merge
storage/example/ha_example.cc:
  manual merge
storage/federated/ha_federated.cc:
  manual merge
storage/myisam/ha_myisam.cc:
  manual merge
storage/myisam/mi_rkey.c:
  manual merge

2 files changed, 9 insertions, 8 deletions

diff --git a/dbug/dbug.c b/dbug/dbug.c
index 6a17db588ad..c4ae89f837f 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1995,12 +1995,14 @@ static char *DbugMalloc(size_t size)
 
 
 /*
- *     strtok lookalike - splits on ':', magically handles :\ and :/
+ *     strtok lookalike - splits on ':', magically handles ::, :\ and :/
  */
 
 static const char *DbugStrTok(const char *s)
 {
-  while (s[0] && (s[0] != ':' || (s[1] == '\\' || s[1] == '/')))
+  const char *start=s;
+  while (s[0] && (s[0] != ':' ||
+                  (s[1] == '\\' || s[1] == '/' || (s[1] == ':' && s++))))
     s++;
   return s;
 }
diff --git a/dbug/user.r b/dbug/user.r
index 3bcc0c91d1d..e41367de321 100644
--- a/dbug/user.r
+++ b/dbug/user.r
@@ -908,9 +908,10 @@ via the
 .B DBUG_PUSH 
 or
 .B DBUG_SET
-macros. Control string consists of colon separate flags. A flag
-may take an argument or a list of arguments. If a control string
-starts from a '+' sign it works
+macros. Control string consists of colon separate flags.  Colons
+that are part of ':\\',  ':/', or '::' are not considered flag
+separators. A flag may take an argument or a list of arguments.
+If a control string starts from a '+' sign it works
 .I incrementally,
 that is, it can modify existing state without overriding it. In such a
 string every flag may be preceded by a '+' or '-' to enable or disable
@@ -923,9 +924,7 @@ optional.
 .LI a[,file]
 Redirect the debugger output stream and append it to the specified
 file.  The default output stream is stderr.  A null argument list
-causes output to be redirected to stdout.  A colon that is followed by
-the '\\' or '/' is cosidered a part of the path and not a flag
-separator.
+causes output to be redirected to stdout.
 .SP 1
 EX: \fCa,C:\\tmp\\log\fR
 .LI A[,file]