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
0eff6e7b
Commit
0eff6e7b
authored
16 years ago
by
istruewing@stella.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
parents
44fbe74e
c82b842a
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
5 deletions
+26
-5
mysql-test/r/federated.result
mysql-test/r/federated.result
+2
-0
mysql-test/t/federated.test
mysql-test/t/federated.test
+12
-0
storage/federated/ha_federated.cc
storage/federated/ha_federated.cc
+12
-5
No files found.
mysql-test/r/federated.result
View file @
0eff6e7b
...
...
@@ -2090,6 +2090,8 @@ a b
1 1
DROP TABLE t1;
DROP TABLE t1;
CREATE TABLE t1 (a INT) ENGINE=federated CONNECTION='mysql://@:://';
DROP TABLE t1;
End of 5.1 tests
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/federated.test
View file @
0eff6e7b
...
...
@@ -1816,5 +1816,17 @@ DROP TABLE t1;
connection
slave
;
DROP
TABLE
t1
;
#
# BUG#34788 - malformed federated connection url is not handled correctly -
# crashes server !
#
# also tests
#
# BUG#35509 - Federated leaks memory when connecting to localhost/default
# port
#
CREATE
TABLE
t1
(
a
INT
)
ENGINE
=
federated
CONNECTION
=
'mysql://@:://'
;
DROP
TABLE
t1
;
--
echo
End
of
5.1
tests
source
include
/
federated_cleanup
.
inc
;
This diff is collapsed.
Click to expand it.
storage/federated/ha_federated.cc
View file @
0eff6e7b
...
...
@@ -794,8 +794,8 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
goto
error
;
/*
Found that if the string is:
user:@hostname:port/db/table
Then password is a null string, so set to NULL
user:@hostname:port/db/table
Then password is a null string, so set to NULL
*/
if
((
share
->
password
[
0
]
==
'\0'
))
share
->
password
=
NULL
;
...
...
@@ -833,14 +833,21 @@ Then password is a null string, so set to NULL
if
((
strchr
(
share
->
table_name
,
'/'
)))
goto
error
;
/*
If hostname is omitted, we set it to NULL. According to
mysql_real_connect() manual:
The value of host may be either a hostname or an IP address.
If host is NULL or the string "localhost", a connection to the
local host is assumed.
*/
if
(
share
->
hostname
[
0
]
==
'\0'
)
share
->
hostname
=
NULL
;
}
if
(
!
share
->
port
)
{
if
(
strcmp
(
share
->
hostname
,
my_localhost
)
==
0
)
share
->
socket
=
(
char
*
)
MYSQL_UNIX_ADDR
;
if
(
!
share
->
hostname
||
strcmp
(
share
->
hostname
,
my_localhost
)
==
0
)
share
->
socket
=
(
char
*
)
MYSQL_UNIX_ADDR
;
else
share
->
port
=
MYSQL_PORT
;
}
...
...
This diff is collapsed.
Click to expand it.
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