List:Commits« Previous MessageNext Message »
From:jonas oreland Date:October 19 2011 5:57pm
Subject:bzr push into mysql-trunk-cluster branch (jonas.oreland:3393 to 3395)
View as plain text  
 3395 jonas oreland	2011-10-19
      record rpl_ndb_extra_col_slave rpl_extra/rpl_extra_col_slave has added new suppression (wo/ using disable query log)

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result
 3394 jonas oreland	2011-10-19
      ndb - record result for rpl_ndb_dist_priv, it seems like 5.6 obfuscates passwords in binlog...which is a good thing

    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_dist_priv.result
 3393 Ole John Aske	2011-10-18
      Resurected code which implemented the new MRR interface from branch mysql-6.0-telco-7.0.
      
      Several fixes was required in order to make that code work as a looong time
      has passed since it was originally developed:
      
       - Addapted fix for Bug#57481:'multi range read' may fail to close completed NdbScanOperations'
       - Start transactions on demand when MRR operations are created.
       - Corrected bug in calculating size of MRR buffer to allocate.
       - Addapted code to correctly count pruned/sorted & plain scans in MRR
       - Addapted code to handle user specified partition.
      
      SPJ has not yet been integrated into the new MRR code - instead we will (temporary)
      use the default MRR impl when a join is pushed.
      
      Old MRR code is still present as a reference. (Plan to remove that in a later push)

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/handler.cc
      storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
      storage/ndb/src/ndbapi/NdbScanOperation.cpp
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_dist_priv.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_dist_priv.result	2011-09-01 12:36:37 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_dist_priv.result	2011-10-19 17:43:59 +0000
@@ -106,14 +106,14 @@ DROP USER 'newuser'@'localhost';
 == Showing binlog server1 ==
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user'@'localhost' IDENTIFIED by 'mypass'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
 master-bin.000001	#	Query	#	#	use `test`; GRANT UPDATE ON t1 TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; SET PASSWORD FOR 'user'@'localhost'='*D8DECEC305209EEFEC43008E1D420E1AA06B19E0'
 master-bin.000001	#	Query	#	#	use `test`; RENAME USER 'user'@'localhost' TO 'newuser'@'localhost'
-master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON test.* TO 'newuser'@'localhost' IDENTIFIED by 'mypass2'
-master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED by 'mypass'
+master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON `test`.* TO 'newuser'@'localhost' IDENTIFIED BY PASSWORD '*1E9649BB3F345563008E37641B407AFF50E5835C'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
 master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON test.t1 TO 'user2'@'localhost'
-master-bin.000001	#	Query	#	#	use `test`; grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION
+master-bin.000001	#	Query	#	#	use `test`; GRANT ALL PRIVILEGES ON `test`.* TO 'user'@'localhost' WITH GRANT OPTION
 master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON test.t1 TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	REVOKE SELECT ON test.t1 FROM 'user'@'localhost'
 master-bin.000001	#	Query	#	#	CREATE USER 'user3'@'localhost' IDENTIFIED by 'mypass'
@@ -136,7 +136,7 @@ master-bin.000001	#	Query	#	#	grant ALL
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.t1 TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; FLUSH PRIVILEGES
 master-bin.000001	#	Query	#	#	use `test`; REVOKE SELECT ON test.t1 FROM 'user'@'localhost'
-master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user3'@'localhost' IDENTIFIED by 'mypass'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user3'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
 master-bin.000001	#	Query	#	#	use `test`; FLUSH PRIVILEGES
 master-bin.000001	#	Query	#	#	use `test`; REVOKE UPDATE ON t1 FROM 'newuser'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user2'@'localhost'
@@ -183,7 +183,7 @@ master-bin.000001	#	Query	#	#	grant ALL
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.t1 TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; FLUSH PRIVILEGES
 master-bin.000001	#	Query	#	#	use `test`; REVOKE SELECT ON test.t1 FROM 'user'@'localhost'
-master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user3'@'localhost' IDENTIFIED by 'mypass'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user3'@'localhost' IDENTIFIED BY PASSWORD '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4'
 master-bin.000001	#	Query	#	#	use `test`; FLUSH PRIVILEGES
 master-bin.000001	#	Query	#	#	use `test`; REVOKE UPDATE ON t1 FROM 'newuser'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'user2'@'localhost'

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result	2011-06-09 20:26:32 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_extra_col_slave.result	2011-10-19 17:48:54 +0000
@@ -2,6 +2,7 @@ include/master-slave.inc
 [connection master]
 call mtr.add_suppression("Slave: Unknown table 'test.t6' Error_code: 1051");
 call mtr.add_suppression("Slave SQL.*Column [0-9] of table .test.t[0-9]*. cannot be converted from type.* Error_code: 1677");
+call mtr.add_suppression("The slave coordinator and worker threads are stopped, possibly leaving data in inconsistent state");
 **** Diff Table Def Start ****
 *** On Slave ***
 STOP SLAVE;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-cluster branch (jonas.oreland:3393 to 3395) jonas oreland20 Oct