bk commit into 5.0 tree (1.1526)

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1526 03/04/29 12:31:03 pem@xxxxxxxxx +1 -0
  Post-merge fix.

  client/mysql.cc
    1.127 03/04/29 12:31:01 pem@xxxxxxxxx +1 -32
    Post-merge fix.

# 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: pem
# Host: mysql.telia.com
# Root: /home/pem/work/mysql-5.0

--- 1.126/client/mysql.cc       Tue Apr 29 12:06:01 2003
+++ 1.127/client/mysql.cc       Tue Apr 29 12:31:01 2003
@@ -1568,7 +1568,7 @@
     for (i = 0; commands[i].name; i++)
     {
       if (commands[i].func)
-       tee_fprintf(stdout, "%-10s(\\%c)\t%s\n", commands[i].name,
+        tee_fprintf(stdout, "%s\t(\\%c)\t%s\n", commands[i].name,
                    commands[i].cmd_char, commands[i].doc);
     }
   }
@@ -2380,37 +2380,6 @@
   return error;
 }
 
-       /* ARGSUSED */
-static int
-com_delimiter(String *buffer __attribute__((unused)), char *line)
-{
-  char *tmp;
-  char buff[256];
-
-  if (strlen(line)> 255)
-  {
-    put_info("'DELIMITER' command was too long.", INFO_ERROR);
-    return 0;
-  }
-  bzero(buff, sizeof(buff));
-  strmov(buff, line);
-  tmp= get_arg(buff, 0);
-
-  if (!tmp || !*tmp)
-  {
-    put_info("DELIMITER must be followed by a 'delimiter' char", INFO_ERROR);
-    return 0;
-  }
-
-  if (strlen(tmp)> 1)
-  {
-    put_info("Argument must be one char", INFO_ERROR);
-    return 0;
-  }
-
-  delimiter= *tmp;
-  return 0;
-}
 
        /* ARGSUSED */
 static int

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx