1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix minor bug and add test of connection with new/old/without passwords

Browse Source
This commit is contained in:
peter@mysql.com 2002-12-05 14:01:15 +03:00
parent 3ee8bee22f
commit dac10a8c81
4 changed files with 101 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/libmysql.c
View File

@ -2233,7 +2233,6 @@ Try also with PIPE or TCP/IP
bfill(end, SCRAMBLE_LENGTH, 'x'); bfill(end, SCRAMBLE_LENGTH, 'x');
end+=SCRAMBLE_LENGTH; end+=SCRAMBLE_LENGTH;
*end=0; *end=0;
end++;
} }
else /* For empty password*/ else /* For empty password*/
{ {

34
mysql-test/r/connect.result Normal file
View File

@ -0,0 +1,34 @@
show tables;
Tables_in_mysql
columns_priv
db
func
host
tables_priv
user
show tables;
Tables_in_test
grant ALL on *.* to test@localhost identified by "gambling";
grant ALL on *.* to test@127.0.0.1 identified by "gambling";
show tables;
Tables_in_mysql
columns_priv
db
func
host
tables_priv
user
show tables;
Tables_in_test
update mysql.user set password=old_password("gambling2") where user="test";
flush privileges;
show tables;
Tables_in_mysql
columns_priv
db
func
host
tables_priv
user
show tables;
Tables_in_test

67
mysql-test/t/connect.test Normal file
View File

@ -0,0 +1,67 @@
# This test is to check various cases of connections
# with right and wrong password, with and without database
# Unfortunately the check is incomplete as we can't handle errors on connect
# Also we can't connect without database
#connect (con1,localhost,root,,"");
#show tables;
connect (con1,localhost,root,,mysql);
show tables;
connect (con1,localhost,root,,test);
show tables;
# Re enable this one day if error handling on connect will take place
#connect (con1,localhost,root,z,test2);
#--error 1045
#connect (con1,localhost,root,z,);
#--error 1045
grant ALL on *.* to test@localhost identified by "gambling";
grant ALL on *.* to test@127.0.0.1 identified by "gambling";
# Now check this user with different databases
#connect (con1,localhost,test,gambling,"");
#show tables;
connect (con1,localhost,test,gambling,mysql);
show tables;
connect (con1,localhost,test,gambling,test);
show tables;
# Re enable this one day if error handling on connect will take place
#connect (con1,localhost,test,,test2);
#--error 1045
#connect (con1,localhost,test,,"");
#--error 1045
#connect (con1,localhost,test,zorro,test2);
#--error 1045
#connect (con1,localhost,test,zorro,);
#--error 1045
# check if old password version also works
update mysql.user set password=old_password("gambling2") where user="test";
flush privileges;
#connect (con1,localhost,test,gambling2,"");
#show tables;
connect (con1,localhost,test,gambling2,mysql);
show tables;
connect (con1,localhost,test,gambling2,test);
show tables;
# Re enable this one day if error handling on connect will take place
#connect (con1,localhost,test,,test2);
#--error 1045
#connect (con1,localhost,test,,);
#--error 1045
#connect (con1,localhost,test,zorro,test2);
#--error 1045
#connect (con1,localhost,test,zorro,);
#--error 1045

1
sql/mini_client.cc
View File

@ -815,7 +815,6 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
bfill(end, SCRAMBLE_LENGTH, 'x'); bfill(end, SCRAMBLE_LENGTH, 'x');
end+=SCRAMBLE_LENGTH; end+=SCRAMBLE_LENGTH;
*end=0; *end=0;
end++;
} }
else /* For empty password*/ else /* For empty password*/
{ {