Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
34b54fa8
Commit
34b54fa8
authored
Mar 27, 2006
by
ian@zim.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0
into zim.(none):/home/ian/workspace/mysql-5.0
parents
1da875b2
8607f1df
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
.bzrignore
.bzrignore
+3
-0
client/mysql.cc
client/mysql.cc
+9
-2
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+1
-0
No files found.
.bzrignore
View file @
34b54fa8
...
...
@@ -1275,3 +1275,6 @@ zlib/*.ds?
zlib/*.vcproj
scripts/mysql_upgrade
include/openssl
mysql-test/r/bdb.log
mysql-test/r/im_client_port.log
mysql-test/r/udf.log
client/mysql.cc
View file @
34b54fa8
...
...
@@ -653,7 +653,7 @@ static struct my_option my_long_options[] =
"Base name of shared memory."
,
(
gptr
*
)
&
shared_memory_base_name
,
(
gptr
*
)
&
shared_memory_base_name
,
0
,
GET_STR_ALLOC
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#endif
{
"socket"
,
'S'
,
"Socket file to use for connection."
,
{
"socket"
,
'S'
,
"Socket file to use for connection.
(This will override --port unless --protocol=TCP is specified.)
"
,
(
gptr
*
)
&
opt_mysql_unix_port
,
(
gptr
*
)
&
opt_mysql_unix_port
,
0
,
GET_STR_ALLOC
,
REQUIRED_ARG
,
0
,
0
,
0
,
0
,
0
,
0
},
#include "sslopt-longopts.h"
...
...
@@ -940,6 +940,13 @@ static int get_options(int argc, char **argv)
connect_flag
=
0
;
/* Not in interactive mode */
}
if
(
opt_mysql_port
&&
(
!
opt_protocol
)
&&
(
!
opt_mysql_unix_port
))
{
/* Not checking return type since we are using a constant value */
/* straight from the initialization of sql_protocol_typelib. */
opt_protocol
=
find_type
(
"TCP"
,
&
sql_protocol_typelib
,
0
);
}
if
(
strcmp
(
default_charset
,
charset_info
->
csname
)
&&
!
(
charset_info
=
get_charset_by_csname
(
default_charset
,
MY_CS_PRIMARY
,
MYF
(
MY_WME
))))
...
...
mysql-test/t/disabled.def
View file @
34b54fa8
...
...
@@ -12,3 +12,4 @@
sp-goto : GOTO is currently is disabled - will be fixed in the future
ndb_load : Bug#17233
udf : Bug#18564 (Permission by Brian)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment