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
d2e45f20
Commit
d2e45f20
authored
Jul 13, 2007
by
dkatz@damien-katzs-computer.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor fixes for test failures and compiler warnings for Bug #29579.
parent
a55c8bef
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
66 deletions
+4
-66
extra/yassl/include/yassl_int.hpp
extra/yassl/include/yassl_int.hpp
+1
-1
extra/yassl/src/yassl_int.cpp
extra/yassl/src/yassl_int.cpp
+1
-1
mysql-test/r/mysqltest.result
mysql-test/r/mysqltest.result
+1
-1
mysql-test/t/mysqltest.test
mysql-test/t/mysqltest.test
+1
-1
mysql-test/t/ssl_big.test
mysql-test/t/ssl_big.test
+0
-62
No files found.
extra/yassl/include/yassl_int.hpp
View file @
d2e45f20
...
...
@@ -584,7 +584,7 @@ class SSL {
Socket
socket_
;
// socket wrapper
Buffers
buffers_
;
// buffered handshakes and data
Log
log_
;
// logger
bool
quietShutdown_
;
bool
quietShutdown_
;
// shutdown without handshakes
// optimization variables
bool
has_data_
;
// buffered data ready?
...
...
extra/yassl/src/yassl_int.cpp
View file @
d2e45f20
...
...
@@ -291,7 +291,7 @@ const ClientKeyFactory& sslFactory::getClientKey() const
SSL
::
SSL
(
SSL_CTX
*
ctx
)
:
secure_
(
ctx
->
getMethod
()
->
getVersion
(),
crypto_
.
use_random
(),
ctx
->
getMethod
()
->
getSide
(),
ctx
->
GetCiphers
(),
ctx
,
ctx
->
GetDH_Parms
().
set_
),
has_data_
(
false
),
quietShutdown
_
(
false
)
ctx
->
GetDH_Parms
().
set_
),
quietShutdown_
(
false
),
has_data
_
(
false
)
{
if
(
int
err
=
crypto_
.
get_random
().
GetError
())
{
SetError
(
YasslError
(
err
));
...
...
mysql-test/r/mysqltest.result
View file @
d2e45f20
...
...
@@ -420,7 +420,7 @@ mysqltest: At line 1: query 'connect con2,localhost,root,,illegal_db' failed: 1
mysqltest: At line 1: Illegal argument for port: 'illegal_port'
mysqltest: At line 1: Illegal option to connect: SMTP
OK
mysqltest:
In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted, you can have max 128 connections
mysqltest:
The test didn't produce any output
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
...
...
mysql-test/t/mysqltest.test
View file @
d2e45f20
...
...
@@ -1263,7 +1263,7 @@ while ($i)
EOF
--
exec
echo
"source
$MYSQLTEST_VARDIR
/tmp/mysqltest.sql; echo OK;"
|
$MYSQL_TEST
2
>&
1
# Repeat connect/disconnect
, exceed max number of connections
# Repeat connect/disconnect
--
write_file
$MYSQLTEST_VARDIR
/
tmp
/
mysqltest
.
sql
let
$i
=
200
;
while
(
$i
)
...
...
mysql-test/t/ssl_big.test
deleted
100644 → 0
View file @
a55c8bef
# Turn on ssl between the client and server
# and run a number of tests
--
source
include
/
have_ssl
.
inc
connect
(
ssl_con
,
localhost
,
root
,,,,,
SSL
);
# Check ssl turned on
SHOW
STATUS
LIKE
'Ssl_cipher'
;
# Source select test case
--
source
include
/
common
-
tests
.
inc
# Check ssl turned on
SHOW
STATUS
LIKE
'Ssl_cipher'
;
disconnect
ssl_con
;
#
# Bug #29579 Clients using SSL can hang the server
#
connect
(
ssl_con
,
localhost
,
root
,,,,,
SSL
);
create
table
t1
(
a
int
);
disconnect
ssl_con
;
let
$count
=
2000
;
while
(
$count
)
{
connect
(
ssl_con
,
localhost
,
root
,,,,,
SSL
);
let
$i
=
1
;
while
(
$i
)
{
eval
insert
into
t1
values
(
$count
);
dec
$count
;
dec
$i
;
}
# This select causes the net buffer to fill as the server sends the results
# but the client doesn't reap the results. The results are larger each time
# through the loop, so that eventually the buffer is completely full
# at the exact moment the server attempts to the close the connection with
# the lock held.
send
select
*
from
t1
;
# now send the quit the command so the server will initiate the shutdown.
send_quit
ssl_con
;
# if the server is hung, this will hang too:
connect
(
ssl_con2
,
localhost
,
root
,,,,,
SSL
);
# no hang if we get here, close and retry
disconnect
ssl_con2
;
disconnect
ssl_con
;
}
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