Commit 146019b5 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.0 

into mysql.com:/home/mydev/mysql-4.0-bug2831


BitKeeper/etc/logging_ok:
  auto-union
parents ae2b73a5 392757a2

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ hf@deer.mysql.r18.ru 
hf@genie.(none)

igor@hundin.mysql.fi

igor@rurik.mysql.com

ingo@mysql.com

jani@a80-186-24-72.elisa-laajakaista.fi

jani@dsl-jkl1657.dial.inet.fi

jani@hynda.(none)

client/mysql.cc

+4 −0
Original line number Diff line number Diff line
@@ -2042,6 +2042,10 @@ static int 
com_shell(String *buffer, char *line __attribute__((unused)))

{

  char *shell_cmd;



  /* Skip space from line begin */

  while (isspace(*line))

    line++;

  if (!(shell_cmd = strchr(line, ' ')))

  {

    put_info("Usage: \\! shell-command", INFO_ERROR);