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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
79aefacb
Commit
79aefacb
authored
Aug 25, 2010
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
merge followup fix for 52301
parents
8520a9fd
16b7af9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
client/mysqltest.cc
client/mysqltest.cc
+6
-0
No files found.
client/mysqltest.cc
View file @
79aefacb
...
@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *command)
...
@@ -5220,8 +5220,10 @@ void do_connect(struct st_command *command)
}
}
#endif
#endif
#ifndef EMBEDDED_LIBRARY
if
(
opt_protocol
)
if
(
opt_protocol
)
mysql_options
(
&
con_slot
->
mysql
,
MYSQL_OPT_PROTOCOL
,
(
char
*
)
&
opt_protocol
);
mysql_options
(
&
con_slot
->
mysql
,
MYSQL_OPT_PROTOCOL
,
(
char
*
)
&
opt_protocol
);
#endif
#ifdef HAVE_SMEM
#ifdef HAVE_SMEM
if
(
con_shm
)
if
(
con_shm
)
...
@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct my_option *opt,
...
@@ -6179,8 +6181,10 @@ get_one_option(int optid, const struct my_option *opt,
print_version
();
print_version
();
exit
(
0
);
exit
(
0
);
case
OPT_MYSQL_PROTOCOL
:
case
OPT_MYSQL_PROTOCOL
:
#ifndef EMBEDDED_LIBRARY
opt_protocol
=
find_type_or_exit
(
argument
,
&
sql_protocol_typelib
,
opt_protocol
=
find_type_or_exit
(
argument
,
&
sql_protocol_typelib
,
opt
->
name
);
opt
->
name
);
#endif
break
;
break
;
case
'?'
:
case
'?'
:
usage
();
usage
();
...
@@ -7932,8 +7936,10 @@ int main(int argc, char **argv)
...
@@ -7932,8 +7936,10 @@ int main(int argc, char **argv)
mysql_options
(
&
con
->
mysql
,
MYSQL_SET_CHARSET_DIR
,
mysql_options
(
&
con
->
mysql
,
MYSQL_SET_CHARSET_DIR
,
opt_charsets_dir
);
opt_charsets_dir
);
#ifndef EMBEDDED_LIBRARY
if
(
opt_protocol
)
if
(
opt_protocol
)
mysql_options
(
&
con
->
mysql
,
MYSQL_OPT_PROTOCOL
,(
char
*
)
&
opt_protocol
);
mysql_options
(
&
con
->
mysql
,
MYSQL_OPT_PROTOCOL
,(
char
*
)
&
opt_protocol
);
#endif
#ifdef HAVE_OPENSSL
#ifdef HAVE_OPENSSL
...
...
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