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
534d9587
Commit
534d9587
authored
Nov 07, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/M50/bug14720 into mysql.com:/M51/merge-5.1
mysql-test/r/connect.result: Auto merged
parents
9ea37cf2
af2e0dc4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
20 deletions
+20
-20
mysql-test/r/connect.result
mysql-test/r/connect.result
+10
-10
mysql-test/t/connect.test
mysql-test/t/connect.test
+10
-10
No files found.
mysql-test/r/connect.result
View file @
534d9587
...
@@ -21,9 +21,9 @@ time_zone_transition_type
...
@@ -21,9 +21,9 @@ time_zone_transition_type
user
user
show tables;
show tables;
Tables_in_test
Tables_in_test
connect(localhost,root,z,test2,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,root,z,test2,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
connect(localhost,root,z,test,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,root,z,test,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
grant ALL on *.* to test@localhost identified by "gambling";
grant ALL on *.* to test@localhost identified by "gambling";
grant ALL on *.* to test@127.0.0.1 identified by "gambling";
grant ALL on *.* to test@127.0.0.1 identified by "gambling";
...
@@ -49,13 +49,13 @@ time_zone_transition_type
...
@@ -49,13 +49,13 @@ time_zone_transition_type
user
user
show tables;
show tables;
Tables_in_test
Tables_in_test
connect(localhost,test,,test2,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,,test2,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
connect(localhost,test,,"",MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,,"",MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
connect(localhost,test,zorro,test2,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,zorro,test2,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
connect(localhost,test,zorro,test,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,zorro,test,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
update mysql.user set password=old_password("gambling2") where user=_binary"test";
update mysql.user set password=old_password("gambling2") where user=_binary"test";
flush privileges;
flush privileges;
...
@@ -85,13 +85,13 @@ time_zone_transition_type
...
@@ -85,13 +85,13 @@ time_zone_transition_type
user
user
show tables;
show tables;
Tables_in_test
Tables_in_test
connect(localhost,test,,test2,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,,test2,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
connect(localhost,test,,test,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,,test,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
connect(localhost,test,zorro,test2,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,zorro,test2,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
connect(localhost,test,zorro,test,MASTER_PORT,M
YSQL_TEST_DIR/var/tmp/master.sock
);
connect(localhost,test,zorro,test,MASTER_PORT,M
ASTER_SOCKET
);
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
delete from mysql.user where user=_binary"test";
delete from mysql.user where user=_binary"test";
flush privileges;
flush privileges;
...
...
mysql-test/t/connect.test
View file @
534d9587
...
@@ -17,10 +17,10 @@ show tables;
...
@@ -17,10 +17,10 @@ show tables;
connect
(
con2
,
localhost
,
root
,,
test
);
connect
(
con2
,
localhost
,
root
,,
test
);
show
tables
;
show
tables
;
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
root
,
z
,
test2
);
connect
(
fail_con
,
localhost
,
root
,
z
,
test2
);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
root
,
z
,);
connect
(
fail_con
,
localhost
,
root
,
z
,);
...
@@ -35,16 +35,16 @@ show tables;
...
@@ -35,16 +35,16 @@ show tables;
connect
(
con4
,
localhost
,
test
,
gambling
,
test
);
connect
(
con4
,
localhost
,
test
,
gambling
,
test
);
show
tables
;
show
tables
;
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,,
test2
);
connect
(
fail_con
,
localhost
,
test
,,
test2
);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,,
""
);
connect
(
fail_con
,
localhost
,
test
,,
""
);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,
zorro
,
test2
);
connect
(
fail_con
,
localhost
,
test
,
zorro
,
test2
);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,
zorro
,);
connect
(
fail_con
,
localhost
,
test
,
zorro
,);
...
@@ -63,16 +63,16 @@ show tables;
...
@@ -63,16 +63,16 @@ show tables;
connect
(
con6
,
localhost
,
test
,
gambling3
,
test
);
connect
(
con6
,
localhost
,
test
,
gambling3
,
test
);
show
tables
;
show
tables
;
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,,
test2
);
connect
(
fail_con
,
localhost
,
test
,,
test2
);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,,);
connect
(
fail_con
,
localhost
,
test
,,);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,
zorro
,
test2
);
connect
(
fail_con
,
localhost
,
test
,
zorro
,
test2
);
--
replace_result
$M
YSQL_TEST_DIR
MYSQL_TEST_DIR
$MASTER_MYPORT
MASTER_PORT
--
replace_result
$M
ASTER_MYSOCK
MASTER_SOCKET
$MASTER_MYPORT
MASTER_PORT
--
error
1045
--
error
1045
connect
(
fail_con
,
localhost
,
test
,
zorro
,);
connect
(
fail_con
,
localhost
,
test
,
zorro
,);
...
...
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