Merge mysql.com:/M50/bug14720 into mysql.com:/M51/merge-5.1 (534d9587) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/connect.result

+10 −10

Original line number	Diff line number	Diff line
		@@ -21,9 +21,9 @@ time_zone_transition_type
		user
		show tables;
		Tables_in_test
		connect(localhost,root,z,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,root,z,test2,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'root'@'localhost' (using password: YES)
		connect(localhost,root,z,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,root,z,test,MASTER_PORT,MASTER_SOCKET);
		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@127.0.0.1 identified by "gambling";
		@@ -49,13 +49,13 @@ time_zone_transition_type
		user
		show tables;
		Tables_in_test
		connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,,test2,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
		connect(localhost,test,,"",MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,,"",MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
		connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,zorro,test2,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
		connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,zorro,test,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
		update mysql.user set password=old_password("gambling2") where user=_binary"test";
		flush privileges;
		@@ -85,13 +85,13 @@ time_zone_transition_type
		user
		show tables;
		Tables_in_test
		connect(localhost,test,,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,,test2,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
		connect(localhost,test,,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,,test,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO)
		connect(localhost,test,zorro,test2,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,zorro,test2,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
		connect(localhost,test,zorro,test,MASTER_PORT,MYSQL_TEST_DIR/var/tmp/master.sock);
		connect(localhost,test,zorro,test,MASTER_PORT,MASTER_SOCKET);
		ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES)
		delete from mysql.user where user=_binary"test";
		flush privileges;

mysql-test/t/connect.test

+10 −10

Original line number	Diff line number	Diff line
		@@ -17,10 +17,10 @@ show tables;
		connect (con2,localhost,root,,test);
		show tables;

		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,root,z,test2);
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,root,z,);

		@@ -35,16 +35,16 @@ show tables;
		connect (con4,localhost,test,gambling,test);
		show tables;

		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,,test2);
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,,"");
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,zorro,test2);
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,zorro,);

		@@ -63,16 +63,16 @@ show tables;
		connect (con6,localhost,test,gambling3,test);
		show tables;

		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,,test2);
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,,);
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,zorro,test2);
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_PORT
		--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
		--error 1045
		connect (fail_con,localhost,test,zorro,);