summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <ingo@mysql.com>2004-05-07 10:42:08 +0200
committerunknown <ingo@mysql.com>2004-05-07 10:42:08 +0200
commit146019b593e9806a80863bb55c06dd3cbfcd34d9 (patch)
tree5a48695aca699bb942133823646e8063fd9fccc9
parentae2b73a55ff80c795c9ae42a6c61bcb5bb601c68 (diff)
parent392757a2144e8cd82effe2a9065fc84ec63f5680 (diff)
downloadmariadb-git-146019b593e9806a80863bb55c06dd3cbfcd34d9.tar.gz
Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2831 BitKeeper/etc/logging_ok: auto-union
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--client/mysql.cc4
2 files changed, 5 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index ef879971e38..8cae6142683 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -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)
diff --git a/client/mysql.cc b/client/mysql.cc
index 695cb1f28be..46ade3aef26 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -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);