Commit b65b4767 authored Mar 02, 2006 by unknown

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/M50/mysql-5.0

parents d2df7f5d d5a27fd8

mysql-test/r/grant2.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ Warnings:
		Warning 1265 Data truncated for column 'Alter_routine_priv' at row 1
		FLUSH PRIVILEGES;
		create database TEStdb;
		ERROR 42000: Access denied for user 'mysqltest_1'@'%' to database 'TEStdb'
		Got one of the listed errors
		delete from mysql.user;
		delete from mysql.db where host='%' and user='mysqltest_1' and db='TESTDB';
		insert into mysql.user select * from t1;

mysql-test/t/grant2.test

+2 −1

Original line number	Diff line number	Diff line
		@@ -452,7 +452,8 @@ connect (con1,localhost,mysqltest_1,password,TESTDB);

		# The user mysqltest_1 should only be allowed access to
		# database TESTDB, not TEStdb
		--error 1044
		# On system with "lowercase names" we get error "1007: Can't create db..."
		--error 1044, 1007
		create database TEStdb;

		# Clean-up

sql/net_serv.cc

+1 −1

File changed.

Contains only whitespace changes.