bk commit into 5.0 tree (msvensson:1.2010) BUG#15598

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2010 06/01/09 17:12:26 msvensson@neptunus.(none) +2 -0
  Bug #15598 Server crashes in specific case during setting new password
  - Comparing host string against NULL caused crash. 
  - If host.hostname is NULL treat it as ""

  mysql-test/t/grant.test
    1.38 06/01/09 17:12:14 msvensson@neptunus.(none) +2 -2
    Add test for user with host ""

  mysql-test/r/grant.result
    1.48 06/01/09 17:12:14 msvensson@neptunus.(none) +9 -9
    Update test results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug15598/my50-bug15598

--- 1.47/mysql-test/r/grant.result	2006-01-09 11:16:25 +01:00
+++ 1.48/mysql-test/r/grant.result	2006-01-09 17:12:14 +01:00
@@ -437,15 +437,6 @@
 flush privileges;
 drop database mysqltest_1;
 drop database mysqltest_2;
-insert into mysql.user (host, user) values ('', 'mysqltest_7');
-flush privileges;
-set password for mysqltest_7@ = password('systpass');
-show grants for mysqltest_7@;
-Grants for mysqltest_7@
-GRANT USAGE ON *.* TO 'mysqltest_7'@'' IDENTIFIED BY PASSWORD '*2FB071A056F9BB745219D9C876814231DAF46517'
-drop user mysqltest_7@;
-show grants for mysqltest_7@;
-ERROR 42000: There is no such grant defined for user 'mysqltest_7' on host ''
 SHOW PRIVILEGES;
 Privilege	Context	Comment
 Alter	Tables	To alter the table
@@ -624,3 +615,12 @@
 Grants for root@localhost
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
 set names latin1;
+create user mysqltest_7@;
+set password for mysqltest_7@ = password('systpass');
+show grants for mysqltest_7@;
+Grants for mysqltest_7@
+GRANT USAGE ON *.* TO 'mysqltest_7'@'' IDENTIFIED BY PASSWORD '*2FB071A056F9BB745219D9C876814231DAF46517'
+drop user mysqltest_7@;
+flush privileges;
+show grants for mysqltest_7@;
+ERROR 42000: There is no such grant defined for user 'mysqltest_7' on host ''

--- 1.37/mysql-test/t/grant.test	2006-01-09 11:15:27 +01:00
+++ 1.38/mysql-test/t/grant.test	2006-01-09 17:12:14 +01:00
@@ -503,11 +503,11 @@
 # Bug #15598 Server crashes in specific case during setting new password
 # - Caused by a user with host ''
 #
-insert into mysql.user (host, user) values ('', 'mysqltest_7');
-flush privileges;
+create user mysqltest_7@;
 set password for mysqltest_7@ = password('systpass');
 show grants for mysqltest_7@;
 drop user mysqltest_7@;
+flush privileges; # BUG#16297(flush should be removed when that bug is fixed)
 --error 1141
 show grants for mysqltest_7@;