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
7892dca1
Commit
7892dca1
authored
Jul 04, 2006
by
knielsen@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/data0/knielsen/tmp-5.0
parents
795eafbc
70629938
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
29 additions
and
7 deletions
+29
-7
VC++Files/sql/mysqld.vcproj
VC++Files/sql/mysqld.vcproj
+2
-2
include/my_sys.h
include/my_sys.h
+1
-1
netware/BUILD/mwasmnlm
netware/BUILD/mwasmnlm
+4
-1
netware/BUILD/mwccnlm
netware/BUILD/mwccnlm
+4
-1
netware/BUILD/mwldnlm
netware/BUILD/mwldnlm
+4
-1
sql-common/client.c
sql-common/client.c
+7
-0
sql/item_cmpfunc.cc
sql/item_cmpfunc.cc
+1
-1
tests/Makefile.am
tests/Makefile.am
+6
-0
No files found.
VC++Files/sql/mysqld.vcproj
View file @
7892dca1
...
...
@@ -85,7 +85,7 @@
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions=
"
__NT__;NDEBUG;DBUG_OFF;USE_SYMDIR
;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"
PreprocessorDefinitions=
"
USE_SYMDIR;NDEBUG;DBUG_OFF
;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
...
...
@@ -145,7 +145,7 @@
InlineFunctionExpansion=
"1"
OptimizeForProcessor=
"2"
AdditionalIncludeDirectories=
"../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"
PreprocessorDefinitions=
"
NDEBUG;__NT__
;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"
PreprocessorDefinitions=
"
__NT__;NDEBUG
;DBUG_OFF;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_EXAMPLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"
StringPooling=
"TRUE"
RuntimeLibrary=
"0"
EnableFunctionLevelLinking=
"TRUE"
...
...
include/my_sys.h
View file @
7892dca1
...
...
@@ -597,7 +597,7 @@ extern gptr _my_memdup(const byte *from,uint length,
const
char
*
sFile
,
uint
uLine
,
myf
MyFlag
);
extern
my_string
_my_strdup
(
const
char
*
from
,
const
char
*
sFile
,
uint
uLine
,
myf
MyFlag
);
extern
char
*
_my_strdup_with_length
(
const
byte
*
from
,
uint
length
,
extern
char
*
_my_strdup_with_length
(
const
char
*
from
,
uint
length
,
const
char
*
sFile
,
uint
uLine
,
myf
MyFlag
);
...
...
netware/BUILD/mwasmnlm
View file @
7892dca1
...
...
@@ -5,4 +5,7 @@ set -e
args
=
"
$*
"
wine
--debugmsg
-all
--
mwasmnlm
$args
# NOTE: Option 'pipefail' is not standard sh
set
-o
pipefail
wine
--debugmsg
-all
--
mwasmnlm
$args
|
\
perl
-pe
's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'
netware/BUILD/mwccnlm
View file @
7892dca1
...
...
@@ -7,4 +7,7 @@ set -e
# convert it to "-I../include"
args
=
" "
`
echo
$*
|
sed
-e
's/-I.\/../-I../g'
`
wine
--debugmsg
-all
--
mwccnlm
$args
# NOTE: Option 'pipefail' is not standard sh
set
-o
pipefail
wine
--debugmsg
-all
--
mwccnlm
$args
|
\
perl
-pe
's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'
netware/BUILD/mwldnlm
View file @
7892dca1
...
...
@@ -5,4 +5,7 @@ set -e
args
=
"
$*
"
wine
--debugmsg
-all
--
mwldnlm
$args
# NOTE: Option 'pipefail' is not standard sh
set
-o
pipefail
wine
--debugmsg
-all
--
mwldnlm
$args
|
\
perl
-pe
's/\r//g; s/^\e.*\e(\[J|>)?//; s/[[^:print:]]//g'
sql-common/client.c
View file @
7892dca1
...
...
@@ -1514,6 +1514,7 @@ mysql_ssl_set(MYSQL *mysql __attribute__((unused)) ,
*/
#ifdef HAVE_OPENSSL
static
void
mysql_ssl_free
(
MYSQL
*
mysql
__attribute__
((
unused
)))
{
...
...
@@ -1538,6 +1539,7 @@ mysql_ssl_free(MYSQL *mysql __attribute__((unused)))
DBUG_VOID_RETURN
;
}
#endif
/* HAVE_OPENSSL */
/*
Return the SSL cipher (if any) used for current
...
...
@@ -1553,8 +1555,10 @@ const char * STDCALL
mysql_get_ssl_cipher
(
MYSQL
*
mysql
)
{
DBUG_ENTER
(
"mysql_get_ssl_cipher"
);
#ifdef HAVE_OPENSSL
if
(
mysql
->
net
.
vio
&&
mysql
->
net
.
vio
->
ssl_arg
)
DBUG_RETURN
(
SSL_get_cipher_name
((
SSL
*
)
mysql
->
net
.
vio
->
ssl_arg
));
#endif
/* HAVE_OPENSSL */
DBUG_RETURN
(
NULL
);
}
...
...
@@ -1573,6 +1577,9 @@ mysql_get_ssl_cipher(MYSQL *mysql)
1 Failed to validate server
*/
#ifdef HAVE_OPENSSL
static
int
ssl_verify_server_cert
(
Vio
*
vio
,
const
char
*
server_hostname
)
{
SSL
*
ssl
;
...
...
sql/item_cmpfunc.cc
View file @
7892dca1
...
...
@@ -3303,7 +3303,7 @@ longlong Item_func_regex::val_int()
}
}
null_value
=
0
;
return
my_regexec
(
&
preg
,
res
->
c_ptr
(),
0
,(
my_regmatch_t
*
)
0
,
0
)
?
0
:
1
;
return
my_regexec
(
&
preg
,
res
->
c_ptr
_safe
(),
0
,(
my_regmatch_t
*
)
0
,
0
)
?
0
:
1
;
}
...
...
tests/Makefile.am
View file @
7892dca1
...
...
@@ -42,8 +42,14 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
LIBS
=
@CLIENT_LIBS@
LDADD
=
@CLIENT_EXTRA_LDFLAGS@
\
$(top_builddir)
/libmysql/libmysqlclient.la
if
HAVE_NETWARE
mysql_client_test_LDADD
=
$(LDADD)
$(CXXLDFLAGS)
mysql_client_test_SOURCES
=
mysql_client_test.c
$(yassl_dummy_link_fix)
\
../mysys/my_memmem.c
else
mysql_client_test_LDADD
=
$(LDADD)
$(CXXLDFLAGS)
-L
../mysys
-lmysys
mysql_client_test_SOURCES
=
mysql_client_test.c
$(yassl_dummy_link_fix)
endif
insert_test_SOURCES
=
insert_test.c
$(yassl_dummy_link_fix)
select_test_SOURCES
=
select_test.c
$(yassl_dummy_link_fix)
insert_test_DEPENDENCIES
=
$(LIBRARIES)
$(pkglib_LTLIBRARIES)
...
...
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