List:Internals« Previous MessageNext Message »
From:sinisa Date:March 1 2004 7:54pm
Subject:bk commit into 4.1 tree (Sinisa:1.1747)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1747 04/03/01 21:54:08 Sinisa@stripped +3 -0
  fix for a bug #2953.
  
  When password was granted with a global grant, then granting 
  privileges on database level, without password being specified, 
  will temporary (in memory) set password to ''.

  sql/sql_acl.cc
    1.109 04/03/01 21:54:02 Sinisa@stripped +7 -2
    fix for a bug #2953.
    
    When password was granted with a global grant, then granting 
    privileges on database level, without password being specified, 
    will temporary (in memory) set password to ''.

  mysql-test/t/grant.test
    1.12 04/03/01 21:54:02 Sinisa@stripped +4 -0
    fix for a bug #2953.
    
    When password was granted with a global grant, then granting 
    privileges on database level, without password being specified, 
    will temporary (in memory) set password to ''.

  mysql-test/r/grant.result
    1.15 04/03/01 21:54:02 Sinisa@stripped +6 -0
    fix for a bug #2953.
    
    When password was granted with a global grant, then granting 
    privileges on database level, without password being specified, 
    will temporary (in memory) set password to ''.

# 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.108/sql/sql_acl.cc	Sat Feb 28 23:27:54 2004
+++ 1.109/sql/sql_acl.cc	Mon Mar  1 21:54:02 2004
@@ -829,8 +829,8 @@
 	  acl_user->x509_subject= (x509_subject ?
 				   strdup_root(&mem,x509_subject) : 0);
 	}
-
-        set_user_salt(acl_user, password, password_len);
+	if (password)
+	  set_user_salt(acl_user, password, password_len);
         /* search complete: */
 	break;
       }
@@ -1456,6 +1456,11 @@
     store_record(table,record[1]);			// Save copy for update
     if (combo.password.str)			// If password given
       table->field[2]->store(password, password_len, &my_charset_latin1);
+    else if (!rights && !revoke_grant && thd->lex->ssl_type == SSL_TYPE_NOT_SPECIFIED &&
+	     !thd->lex->mqh.bits)
+    {
+      DBUG_RETURN(0);
+    }
   }
 
   /* Update table columns with new privileges */

--- 1.14/mysql-test/r/grant.result	Sun Feb 15 18:59:48 2004
+++ 1.15/mysql-test/r/grant.result	Mon Mar  1 21:54:02 2004
@@ -165,3 +165,9 @@
 drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
 drop_user4@localhost;
 drop table t1;
+grant usage on *.* to mysqltest_1@localhost identified by "password";
+grant select, update, insert on test.* to mysqltest@localhost;
+show grants for mysqltest_1@localhost;
+Grants for mysqltest_1@localhost
+GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' IDENTIFIED BY PASSWORD '*2470C0C06DEE42FD1618BB99005ADCA2EC9D1E19'
+drop user mysqltest_1@localhost;

--- 1.11/mysql-test/t/grant.test	Mon Feb 16 10:16:33 2004
+++ 1.12/mysql-test/t/grant.test	Mon Mar  1 21:54:02 2004
@@ -125,3 +125,7 @@
 drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
 drop_user4@localhost;
 drop table t1;
+grant usage on *.* to mysqltest_1@localhost identified by "password";
+grant select, update, insert on test.* to mysqltest@localhost;
+show grants for mysqltest_1@localhost;
+drop user mysqltest_1@localhost;
Thread
bk commit into 4.1 tree (Sinisa:1.1747)sinisa1 Mar