From: msvensson Date: February 28 2007 7:34pm Subject: bk commit into 5.1 tree (msvensson:1.2479) BUG#20166 List-Archive: http://lists.mysql.com/commits/20815 X-Bug: 20166 Message-Id: <200702281934.l1SJY3oB028638@pilot.blaudden> Below is the list of changes that have just been committed into a local 5.1 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@stripped, 2007-02-28 20:33:59+01:00, msvensson@stripped +5 -0 Bug#20166 mysql-test-run.pl does not test system privilege tables creation - Additional fixes caused by running without anonymous users mysql-test/r/federated_server.result@stripped, 2007-02-28 20:33:57+01:00, msvensson@stripped +0 -2 There are no default server in mysql.servers anymore The test will create it's own test servers mysql-test/r/rpl_read_only.result@stripped, 2007-02-28 20:33:57+01:00, msvensson@stripped +2 -0 Update result mysql-test/r/rpl_row_USER.result@stripped, 2007-02-28 20:33:57+01:00, msvensson@stripped +4 -4 Update test result, it basically checks that the values return by USER() and CURRENT_USER() are the same on master and slave, so it's doing the correct thing. Since connection m_1 is logged in as ''@localhost% that is what will end up in the log. mysql-test/t/ndb_multi_row.test@stripped, 2007-02-28 20:33:57+01:00, msvensson@stripped +2 -2 Connect as root instead of '' which would pick currently logged in user mysql-test/t/rpl_read_only.test@stripped, 2007-02-28 20:33:57+01:00, msvensson@stripped +6 -0 Add user test with no privs(no anonymous by default anymore) # 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: pilot.blaudden # Root: /home/msvensson/mysql/mysql-5.1-maint --- 1.2/mysql-test/r/rpl_row_USER.result 2006-01-17 12:59:04 +01:00 +++ 1.3/mysql-test/r/rpl_row_USER.result 2007-02-28 20:33:57 +01:00 @@ -22,15 +22,15 @@ CALL mysqltest1.p1(); SELECT * FROM mysqltest1.t1 ORDER BY a; a users 1 tester@localhost -2 @localhost +2 @localhost% 3 tester@localhost -4 @localhost +4 @localhost% SELECT * FROM mysqltest1.t1 ORDER BY a; a users 1 tester@localhost -2 @localhost +2 @localhost% 3 tester@localhost -4 @localhost +4 @localhost% DROP DATABASE mysqltest1; REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; --- 1.1/mysql-test/r/rpl_read_only.result 2006-12-01 02:43:30 +01:00 +++ 1.2/mysql-test/r/rpl_read_only.result 2007-02-28 20:33:57 +01:00 @@ -4,6 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +create user test; create table t1(a int) engine=InnoDB; create table t2(a int) engine=MyISAM; insert into t1 values(1001); @@ -109,5 +110,6 @@ insert into t1 values(1006); ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement insert into t2 values(2006); ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement +drop user test; drop table t1; drop table t2; --- 1.1/mysql-test/t/rpl_read_only.test 2006-12-01 02:43:30 +01:00 +++ 1.2/mysql-test/t/rpl_read_only.test 2007-02-28 20:33:57 +01:00 @@ -2,6 +2,11 @@ -- source include/master-slave.inc -- source include/have_innodb.inc +# Create a test and replicate it to slave +connection master; +create user test; +sync_slave_with_master; + # Setting the master readonly : # - the variable @@readonly is not replicated on the slave @@ -99,6 +104,7 @@ insert into t2 values(2006); ## Cleanup connection master; +drop user test; drop table t1; drop table t2; sync_slave_with_master; --- 1.4/mysql-test/r/federated_server.result 2006-12-13 01:39:36 +01:00 +++ 1.5/mysql-test/r/federated_server.result 2007-02-28 20:33:57 +01:00 @@ -49,7 +49,6 @@ SOCKET '', OWNER 'root'); select * from mysql.servers; Server_name Host Db Username Password Port Socket Wrapper Owner -test localhost test root 0 mysql root server_one 127.0.0.1 first_db root SLAVE_PORT mysql root server_two 127.0.0.1 second_db root SLAVE_PORT mysql root DROP TABLE IF EXISTS federated.old; @@ -101,7 +100,6 @@ drop server 'server_one'; drop server 'server_two'; select * from mysql.servers; Server_name Host Db Username Password Port Socket Wrapper Owner -test localhost test root 0 mysql root drop table first_db.t1; drop table second_db.t1; drop database first_db; --- 1.3/mysql-test/t/ndb_multi_row.test 2006-03-06 18:06:01 +01:00 +++ 1.4/mysql-test/t/ndb_multi_row.test 2007-02-28 20:33:57 +01:00 @@ -23,8 +23,8 @@ select * from t2; show status like 'handler_discover%'; # Check dropping and recreating table on same server -connect (con1,localhost,,,test); -connect (con2,localhost,,,test); +connect (con1,localhost,root,,test); +connect (con2,localhost,root,,test); connection con1; select * from t1; connection con2;