Commit 47fb31aa authored by unknown's avatar unknown

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


libmysql/libmysql.c:
  Small fix (resulted in connection without database even if one is specified)
sql/mini_client.cc:
  The same fix for replication copy
parent 339cf7ce
......@@ -2233,7 +2233,6 @@ Try also with PIPE or TCP/IP
bfill(end, SCRAMBLE_LENGTH, 'x');
end+=SCRAMBLE_LENGTH;
*end=0;
end++;
}
else /* For empty password*/
{
......
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
# 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
......@@ -815,7 +815,6 @@ mc_mysql_connect(MYSQL *mysql,const char *host, const char *user,
bfill(end, SCRAMBLE_LENGTH, 'x');
end+=SCRAMBLE_LENGTH;
*end=0;
end++;
}
else /* For empty password*/
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment