bzr commit into mysql-6.0-codebase-bugfixing branch (marc.alff:3867)

[Marc Alff]

#At file:///Users/malff/BZR_TREE/mysql-6.0-codebase-bugfixing/ based on revid:horst.hunger@stripped

 3867 Marc Alff	2010-04-14 [merge]
      merge mysql-next-mr-bugfixing --> mysql-6.0-codebase-bugfixing

    modified:
      mysql-test/r/grant.result
      mysql-test/r/insert_notembedded.result
      mysql-test/r/mysqldump.result
      mysql-test/r/trigger_notembedded.result
      storage/perfschema/pfs_global.h
=== modified file 'mysql-test/r/grant.result'
--- a/mysql-test/r/grant.result	2010-02-23 18:47:51 +0000
+++ b/mysql-test/r/grant.result	2010-04-14 13:39:47 +0000
@@ -492,7 +492,7 @@ create database mysqltest;
 create table mysqltest.t1 (a int,b int,c int);
 grant all on mysqltest.t1 to mysqltest_1@localhost;
 alter table t1 rename t2;
-ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
 revoke all privileges on mysqltest.t1 from mysqltest_1@localhost;
 delete from mysql.user where user=_binary'mysqltest_1';
 drop database mysqltest;
@@ -983,9 +983,9 @@ Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
 GRANT SELECT ON `mysqltest1`.`t1` TO 'mysqltest_1'@'localhost'
 RENAME TABLE t1 TO t2;
-ERROR 42000: DROP,ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
 ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: DROP,ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
+ERROR 42000: DROP, ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
 GRANT DROP ON mysqltest1.t1 TO mysqltest_1@localhost;
 RENAME TABLE t1 TO t2;
 ERROR 42000: ALTER command denied to user 'mysqltest_1'@'localhost' for table 't1'
@@ -997,9 +997,9 @@ Grants for mysqltest_1@localhost
 GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost'
 GRANT SELECT, DROP, ALTER ON `mysqltest1`.`t1` TO 'mysqltest_1'@'localhost'
 RENAME TABLE t1 TO t2;
-ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
 ALTER TABLE t1 RENAME TO t2;
-ERROR 42000: INSERT,CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
+ERROR 42000: INSERT, CREATE command denied to user 'mysqltest_1'@'localhost' for table 't2'
 GRANT INSERT, CREATE ON mysqltest1.t1 TO mysqltest_1@localhost;
 SHOW GRANTS;
 Grants for mysqltest_1@localhost

=== modified file 'mysql-test/r/insert_notembedded.result'
--- a/mysql-test/r/insert_notembedded.result	2009-11-24 19:46:33 +0000
+++ b/mysql-test/r/insert_notembedded.result	2010-04-14 13:39:47 +0000
@@ -32,7 +32,7 @@ INNER JOIN      view_stations AS station
 ON              table_source.id = stations.icao
 LEFT JOIN       table_target AS old
 USING           (mexs_id);
-ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'table_target'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target'
 REPLACE INTO    view_target2
 SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
 FROM            table_source
@@ -40,7 +40,7 @@ INNER JOIN      view_stations AS station
 ON              table_source.id = stations.icao
 LEFT JOIN       view_target2 AS old
 USING           (mexs_id);
-ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'view_target2'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'view_target2'
 REPLACE INTO    view_target3
 SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
 FROM            table_source
@@ -60,7 +60,7 @@ ON              table_source.id = statio
 LEFT JOIN       table_target AS old
 USING           (mexs_id);
 REPLACE INTO    table_target2 VALUES ('00X45Y78','2006-07-12 07:50:00');
-ERROR 42000: INSERT,DELETE command denied to user 'user20989'@'localhost' for table 'table_target2'
+ERROR 42000: INSERT, DELETE command denied to user 'user20989'@'localhost' for table 'table_target2'
 REPLACE INTO    view_target2  VALUES ('12X45Y78','2006-07-12 07:50:00');
 SELECT          stations.mexs_id AS mexs_id, datetime AS messzeit
 FROM            table_source

=== modified file 'mysql-test/r/mysqldump.result'
--- a/mysql-test/r/mysqldump.result	2010-02-21 18:25:29 +0000
+++ b/mysql-test/r/mysqldump.result	2010-04-14 13:39:47 +0000
@@ -3558,8 +3558,8 @@ reset master;
 mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
 mysqldump: Couldn't execute 'FLUSH /*!40101 LOCAL */ TABLES': Access denied; you need (at least one of) the RELOAD privilege(s) for this operation (1227)
 grant RELOAD on *.* to mysqltest_1@localhost;
-mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER,REPLICATION CLIENT privilege(s) for this operation (1227)
-mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER,REPLICATION CLIENT privilege(s) for this operation (1227)
+mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, REPLICATION CLIENT privilege(s) for this operation (1227)
+mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need (at least one of) the SUPER, REPLICATION CLIENT privilege(s) for this operation (1227)
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
 drop table t1;
 drop user mysqltest_1@localhost;

=== modified file 'mysql-test/r/trigger_notembedded.result'
--- a/mysql-test/r/trigger_notembedded.result	2010-01-22 08:06:07 +0000
+++ b/mysql-test/r/trigger_notembedded.result	2010-04-14 13:39:47 +0000
@@ -383,7 +383,7 @@ CALL p2(NEW.i1);
 INSERT INTO t1 VALUES (7);
 ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for column 'i1' in table 't1'
 INSERT INTO t2 VALUES (11);
-ERROR 42000: SELECT,UPDATE command denied to user 'mysqltest_dfn'@'localhost' for column 'i1' in table 't2'
+ERROR 42000: SELECT, UPDATE command denied to user 'mysqltest_dfn'@'localhost' for column 'i1' in table 't2'
 DROP TRIGGER t2_bi;
 DROP TRIGGER t1_bi;
 GRANT SELECT ON mysqltest_db1.* TO mysqltest_dfn@localhost;

=== modified file 'storage/perfschema/pfs_global.h'
--- a/storage/perfschema/pfs_global.h	2010-04-13 10:05:22 +0000
+++ b/storage/perfschema/pfs_global.h	2010-04-14 13:39:47 +0000
@@ -66,12 +66,13 @@ inline uint randomized_index(const void 
   value= (reinterpret_cast<intptr> (ptr)) >> 3;
   value*= 1789;
   value+= seed2 + seed1 + 1;
-  value%= max_size;
   
-  result= static_cast<uint> (value);
+  result= (static_cast<uint> (value)) % max_size;
+
   seed2= seed1*seed1;
   seed1= result;
 
+  DBUG_ASSERT(result < max_size);
   return result;
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]