diff options
| author | salle@banica.(none) <> | 2002-12-27 18:13:32 +0200 |
|---|---|---|
| committer | salle@banica.(none) <> | 2002-12-27 18:13:32 +0200 |
| commit | a2e82f5ff7adfb3b2b36dafae8ab7e24e7819536 (patch) | |
| tree | 087fc94142c2addfc2bbe917d669bba6e28a5639 | |
| parent | d85a01db2cd557cecc06cebe45502f54de233dac (diff) | |
| download | mariadb-git-a2e82f5ff7adfb3b2b36dafae8ab7e24e7819536.tar.gz | |
Removed ^M
Reported by Georg Richter as it brokes his build with mipspro
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | client/mysqlimport.c | 2 | ||||
| -rw-r--r-- | client/mysqlshow.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 79637c24d10..697a3541769 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -69,6 +69,7 @@ ram@gw.udmsearch.izhnet.ru ram@mysql.r18.ru ram@ram.(none) root@x3.internalnet +salle@banica.(none) salle@geopard.(none) salle@geopard.online.bg sasha@mysql.sashanet.com 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, |