summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-27 12:57:44 +0300
committerAlexander Nozdrin <alik@sun.com>2009-10-27 12:57:44 +0300
commitcd6e15989044e5d4a708a6ee191bcd3c13dc0071 (patch)
treea009b70e1c934e05a30390fa4b5a5dbca4153154 /sql-common
parent381ad2ec6a2bb8c951b88274598e304f695ed04c (diff)
parent453eb014f7f44cf92fa40887e17a253338c696fb (diff)
downloadmariadb-git-cd6e15989044e5d4a708a6ee191bcd3c13dc0071.tar.gz
Automerge from mysql-next-mr.
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 5ae3a2816a5..11d8b0cce4b 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1090,6 +1090,8 @@ void mysql_read_default_options(struct st_mysql_options *options,
char **option=argv;
while (*++option)
{
+ if (option[0] == args_separator) /* skip arguments separator */
+ continue;
/* DBUG_PRINT("info",("option: %s",option[0])); */
if (option[0][0] == '-' && option[0][1] == '-')
{