summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <salle@banica.(none)>2002-12-27 18:13:32 +0200
committerunknown <salle@banica.(none)>2002-12-27 18:13:32 +0200
commit22bbe44fd0062a213318f2e9d11a15eed6c16bdc (patch)
tree087fc94142c2addfc2bbe917d669bba6e28a5639 /client
parent5265a1656ea58d9534ebadfbd45c662080f89bb0 (diff)
downloadmariadb-git-22bbe44fd0062a213318f2e9d11a15eed6c16bdc.tar.gz
Removed ^M
Reported by Georg Richter as it brokes his build with mipspro client/mysqlimport.c: Removed ^M client/mysqlshow.c: Removed ^M BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'client')
-rw-r--r--client/mysqlimport.c2
-rw-r--r--client/mysqlshow.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 2de4a9b81b5..408a5873589 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -117,7 +117,7 @@ static struct my_option my_long_options[] =
{"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
(gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
0},
- {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory)",
+ {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory)",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"replace", 'r', "If duplicate unique key was found, replace old row.",
(gptr*) &replace, (gptr*) &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index df624a02c55..e6e21f177ef 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -179,7 +179,7 @@ static struct my_option my_long_options[] =
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
- {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory)",
+ {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory)",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
#ifdef HAVE_SMEM
{"shared_memory_base_name", OPT_SHARED_MEMORY_BASE_NAME,