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
752e5f1e
Commit
752e5f1e
authored
Oct 24, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents
7cd0f1a6
8b3f8232
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
35 additions
and
4 deletions
+35
-4
client/mysqldump.c
client/mysqldump.c
+2
-2
configure.in
configure.in
+4
-0
netware/BUILD/compile-netware-END
netware/BUILD/compile-netware-END
+7
-2
netware/BUILD/mwenv
netware/BUILD/mwenv
+6
-0
netware/BUILD/mwldnlm
netware/BUILD/mwldnlm
+7
-0
vio/viossl.c
vio/viossl.c
+5
-0
vio/viosslfactories.c
vio/viosslfactories.c
+4
-0
No files found.
client/mysqldump.c
View file @
752e5f1e
...
...
@@ -1195,7 +1195,7 @@ static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send,
const
char
*
first_attribute_name
,
...)
{
va_list
arg_list
;
char
*
attribute_name
,
*
attribute_value
;
c
onst
c
har
*
attribute_name
,
*
attribute_value
;
fputs
(
sbeg
,
xml_file
);
fputc
(
'<'
,
xml_file
);
...
...
@@ -1318,7 +1318,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
static
void
print_blob_as_hex
(
FILE
*
output_file
,
const
char
*
str
,
ulong
len
)
{
/* sakaik got the idea to to provide blob's in hex notation. */
char
*
ptr
=
str
,
*
end
=
ptr
+
len
;
c
onst
c
har
*
ptr
=
str
,
*
end
=
ptr
+
len
;
for
(;
ptr
<
end
;
ptr
++
)
fprintf
(
output_file
,
"%02X"
,
*
((
uchar
*
)
ptr
));
check_io
(
output_file
);
...
...
configure.in
View file @
752e5f1e
...
...
@@ -1176,12 +1176,16 @@ EOF
cat
>
$filesed
<<
EOF
s,
\(\.
/conf_to_src
\)\(
\$
(top_srcdir)
\)
,
\1
.linux
\2
,
s,
\(
: conf_to_src
\)
,
\1
.linux,
s,libyassl.la,.libs/libyassl.a,
s,libtaocrypt.la,.libs/libtaocrypt.a,
EOF
;;
libmysql_r/Makefile.in
)
cat
>
$filesed
<<
EOF
s,
\(\.
/conf_to_src
\)\(
\$
(top_srcdir)
\)
,
\1
.linux
\2
,
s,
\(
: conf_to_src
\)
,
\1
.linux,
s,libyassl.la,.libs/libyassl.a,
s,libtaocrypt.la,.libs/libtaocrypt.a,
EOF
;;
strings/Makefile.in
)
...
...
netware/BUILD/compile-netware-END
View file @
752e5f1e
...
...
@@ -18,8 +18,13 @@ rm -rf Makefile.in.bk
# Setup Metrowerks environment
.
$path
/mwenv
# Run autotools(use BUILD/autorun.sh)
.
BUILD/autorun.sh
# Temporary hack to allow building from source dist
if
[
!
"
$USER
"
=
pushbuild
]
then
# Run autotools(use BUILD/autorun.sh)
echo
"Running autotools again(BUILD/autorun.sh)"
.
BUILD/autorun.sh
fi
# configure
./configure
$base_configs
$extra_configs
...
...
netware/BUILD/mwenv
View file @
752e5f1e
...
...
@@ -65,5 +65,11 @@ then
export
TERM
=
linux
fi
# Temporary hack to allow building from source dist
if
[
"
$USER
"
=
pushbuild
]
then
export
ARFLAGS
=
$AR_FLAGS
fi
# Print all env. variables
export
netware/BUILD/mwldnlm
View file @
752e5f1e
...
...
@@ -3,6 +3,13 @@
# stop on errors
set
-e
# If libtool passes "x" as the first argument to this script
# it's an indication that libtool is trying to unpack .la's
# so they can be added to a new library
# This step does not work on Netware and we avoid it by
# replacing the .la library with the path to the .a library
# in Makefile.in
args
=
"
$*
"
# NOTE: Option 'pipefail' is not standard sh
...
...
vio/viossl.c
View file @
752e5f1e
...
...
@@ -26,6 +26,10 @@
#ifdef HAVE_OPENSSL
#ifdef __NETWARE__
/* yaSSL already uses BSD sockets */
#ifndef HAVE_YASSL
/*
The default OpenSSL implementation on NetWare uses WinSock.
This code allows us to use the BSD sockets.
...
...
@@ -47,6 +51,7 @@ static int SSL_set_fd_bsd(SSL *s, int fd)
#define SSL_set_fd(A, B) SSL_set_fd_bsd((A), (B))
#endif
/* HAVE_YASSL */
#endif
/* __NETWARE__ */
...
...
vio/viosslfactories.c
View file @
752e5f1e
...
...
@@ -180,11 +180,15 @@ void netware_ssl_cleanup()
/* free memory from SSL_library_init() */
EVP_cleanup
();
/* OpenSSL NetWare port specific functions */
#ifndef HAVE_YASSL
/* free global X509 method */
X509_STORE_method_cleanup
();
/* free the thread_hash error table */
ERR_free_state_table
();
#endif
}
...
...
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