| List: | Commits | « Previous MessageNext Message » | |
| From: | msvensson | Date: | November 15 2006 10:31am |
| Subject: | bk commit into 5.1 tree (msvensson:1.2365) | ||
| View as plain text | |||
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, 2006-11-15 10:31:23+01:00, msvensson@neptunus.(none) +19 -0 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint MERGE: 1.1810.1698.184 mysql-test/extra/rpl_tests/rpl_deadlock.test@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.11.2.2 mysql-test/extra/rpl_tests/rpl_deadlock.test@stripped, 2006-11-15 10:26:55+01:00, msvensson@neptunus.(none) +0 -0 Merge rename: mysql-test/t/rpl_deadlock.test -> mysql-test/extra/rpl_tests/rpl_deadlock.test mysql-test/extra/rpl_tests/rpl_max_relay_size.test@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.16.4.2 mysql-test/extra/rpl_tests/rpl_max_relay_size.test@stripped, 2006-11-15 10:26:55+01:00, msvensson@neptunus.(none) +0 -0 Merge rename: mysql-test/t/rpl_max_relay_size.test -> mysql-test/extra/rpl_tests/rpl_max_relay_size.test mysql-test/r/key_cache.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.19.1.1 mysql-test/r/mysqldump.result@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +4 -6 Manual merge MERGE: 1.83.1.35 mysql-test/r/rpl_deadlock_innodb.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.8.2.2 mysql-test/r/rpl_deadlock_innodb.result@stripped, 2006-11-15 10:26:55+01:00, msvensson@neptunus.(none) +0 -0 Merge rename: mysql-test/r/rpl_deadlock.result -> mysql-test/r/rpl_deadlock_innodb.result mysql-test/r/rpl_drop_db.result@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +0 -0 Manual merge MERGE: 1.4.1.2 mysql-test/r/rpl_sp.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.13.2.5 mysql-test/r/rpl_stm_max_relay_size.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.20.4.2 mysql-test/r/rpl_stm_max_relay_size.result@stripped, 2006-11-15 10:26:55+01:00, msvensson@neptunus.(none) +0 -0 Merge rename: mysql-test/r/rpl_max_relay_size.result -> mysql-test/r/rpl_stm_max_relay_size.result mysql-test/r/rpl_timezone.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.12.1.3 mysql-test/r/rpl_variables.result@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +0 -1 Manual merge MERGE: 1.3.1.1 mysql-test/r/type_float.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.42.1.6 mysql-test/r/view_grant.result@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.8.1.12 mysql-test/t/init_connect.test@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.5.1.3 mysql-test/t/mysqldump.test@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.76.1.31 mysql-test/t/rpl_drop_db.test@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +0 -2 Manual merge MERGE: 1.6.1.3 mysql-test/t/rpl_sp.test@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +0 -2 Manual merge MERGE: 1.9.2.4 mysql-test/t/rpl_timezone.test@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +0 -0 Manual merge MERGE: 1.8.1.2 mysql-test/t/rpl_variables.test@stripped, 2006-11-15 10:31:20+01:00, msvensson@neptunus.(none) +0 -3 Manual merge MERGE: 1.4.1.1 mysql-test/t/view_grant.test@stripped, 2006-11-15 10:26:56+01:00, msvensson@neptunus.(none) +0 -0 Auto merged MERGE: 1.8.1.10 # 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/mysql-5.1-new-maint/RESYNC --- 1.18/mysql-test/r/rpl_timezone.result 2006-11-15 10:31:30 +01:00 +++ 1.19/mysql-test/r/rpl_timezone.result 2006-11-15 10:31:30 +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; +set @my_time_zone= @@global.time_zone; set timestamp=100000000; create table t1 (t timestamp, n int not null auto_increment, PRIMARY KEY(n)); create table t2 (t char(32), n int not null auto_increment, PRIMARY KEY(n)); @@ -103,3 +104,4 @@ t n 2003-12-31 23:00:00 16 2005-01-01 08:00:00 17 drop table t1, t2; +set global time_zone= @my_time_zone; --- 1.14/mysql-test/t/rpl_timezone.test 2006-11-15 10:31:30 +01:00 +++ 1.15/mysql-test/t/rpl_timezone.test 2006-11-15 10:31:30 +01:00 @@ -17,6 +17,9 @@ source include/master-slave.inc; +# Save original timezone +set @my_time_zone= @@global.time_zone; + # Some preparations let $VERSION=`select version()`; set timestamp=100000000; # for fixed output of mysqlbinlog @@ -133,3 +136,7 @@ connection master; drop table t1, t2; sync_slave_with_master; + +# Restore original timezone +connection master; +set global time_zone= @my_time_zone; --- 1.21/mysql-test/r/rpl_sp.result 2006-11-15 10:31:30 +01:00 +++ 1.22/mysql-test/r/rpl_sp.result 2006-11-15 10:31:30 +01:00 @@ -465,3 +465,5 @@ RETURN 0 DROP PROCEDURE p1; DROP FUNCTION f1; drop table t1; +set global log_bin_trust_function_creators=0; +set global log_bin_trust_function_creators=0; --- 1.19/mysql-test/t/rpl_sp.test 2006-11-15 10:31:30 +01:00 +++ 1.20/mysql-test/t/rpl_sp.test 2006-11-15 10:31:30 +01:00 @@ -519,6 +519,10 @@ connection master; drop table t1; sync_slave_with_master; +# Restore log_bin_trust_function_creators to original value +set global log_bin_trust_function_creators=0; +connection master; +set global log_bin_trust_function_creators=0; --echo End of 5.0 tests --echo End of 5.1 tests --- 1.8/mysql-test/t/init_connect.test 2006-11-15 10:31:30 +01:00 +++ 1.9/mysql-test/t/init_connect.test 2006-11-15 10:31:30 +01:00 @@ -232,7 +232,9 @@ connection con0; disconnect con1; drop trigger trg1; -set global init_connect=default; +# Set init connect back to the value provided in init_connect-master.opt +# doesn't matter as server will be restarted +set global init_connect="set @a='a\\0c'"; revoke all privileges, grant option from mysqltest1@localhost; drop user mysqltest1@localhost; --- 1.8.2.1/mysql-test/r/rpl_deadlock.result 2006-11-15 10:31:30 +01:00 +++ 1.12/mysql-test/r/rpl_deadlock_innodb.result 2006-11-15 10:31:30 +01:00 @@ -4,10 +4,10 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -create table t1 (a int not null, key(a)) engine=innodb; -create table t2 (a int not null, key(a)) engine=innodb; -create table t3 (a int) engine=innodb; -create table t4 (a int) engine=innodb; +CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=innodb; +CREATE TABLE t2 (a INT NOT NULL, KEY(a)) ENGINE=innodb; +CREATE TABLE t3 (a INT) ENGINE=innodb; +CREATE TABLE t4 (a INT) ENGINE=innodb; show variables like 'slave_transaction_retries'; Variable_name Value slave_transaction_retries 10 @@ -50,7 +50,7 @@ Master_User root Master_Port MASTER_MYPORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 18911 +Read_Master_Log_Pos # Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -59,13 +59,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 18911 +Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition None Until_Log_File @@ -78,7 +78,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master # stop slave; -change master to master_log_pos=532; +change master to master_log_pos=536; begin; select * from t2 for update; a @@ -99,7 +99,7 @@ Master_User root Master_Port MASTER_MYPORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 18911 +Read_Master_Log_Pos # Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -108,13 +108,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 18911 +Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition None Until_Log_File @@ -129,7 +129,7 @@ Seconds_Behind_Master # set @my_max_relay_log_size= @@global.max_relay_log_size; set global max_relay_log_size=0; stop slave; -change master to master_log_pos=532; +change master to master_log_pos=536; begin; select * from t2 for update; a @@ -151,7 +151,7 @@ Master_User root Master_Port MASTER_MYPORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 18911 +Read_Master_Log_Pos # Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -160,13 +160,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 18911 +Exec_Master_Log_Pos # Relay_Log_Space # Until_Condition None Until_Log_File --- 1.20.4.1/mysql-test/r/rpl_max_relay_size.result 2006-11-15 10:31:30 +01:00 +++ 1.26/mysql-test/r/rpl_stm_max_relay_size.result 2006-11-15 10:31:30 +01:00 @@ -28,7 +28,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 72952 +Read_Master_Log_Pos 72956 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -37,13 +37,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 72952 +Exec_Master_Log_Pos 72956 Relay_Log_Space # Until_Condition None Until_Log_File @@ -71,7 +71,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 72952 +Read_Master_Log_Pos 72956 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -80,13 +80,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 72952 +Exec_Master_Log_Pos 72956 Relay_Log_Space # Until_Condition None Until_Log_File @@ -114,7 +114,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 72952 +Read_Master_Log_Pos 72956 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -123,13 +123,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 72952 +Exec_Master_Log_Pos 72956 Relay_Log_Space # Until_Condition None Until_Log_File @@ -163,7 +163,7 @@ Slave_SQL_Running No Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 @@ -195,7 +195,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 73038 +Read_Master_Log_Pos 73042 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -204,13 +204,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 73038 +Exec_Master_Log_Pos 73042 Relay_Log_Space # Until_Condition None Until_Log_File @@ -234,7 +234,7 @@ Master_User root Master_Port MASTER_PORT Connect_Retry 1 Master_Log_File master-bin.000001 -Read_Master_Log_Pos 73114 +Read_Master_Log_Pos 73118 Relay_Log_File # Relay_Log_Pos # Relay_Master_Log_File master-bin.000001 @@ -243,13 +243,13 @@ Slave_SQL_Running Yes Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table -Replicate_Ignore_Table +Replicate_Ignore_Table # Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno 0 Last_Error Skip_Counter 0 -Exec_Master_Log_Pos 73114 +Exec_Master_Log_Pos 73118 Relay_Log_Space # Until_Condition None Until_Log_File @@ -264,8 +264,8 @@ Seconds_Behind_Master # flush logs; show master status; File master-bin.000002 -Position 98 -Binlog_Do_DB +Position 102 +Binlog_Do_DB <Binlog_Ignore_DB> Binlog_Ignore_DB set global max_binlog_size= @my_max_binlog_size; # --- 1.11.2.1/mysql-test/t/rpl_deadlock.test 2006-11-15 10:31:30 +01:00 +++ 1.14/mysql-test/extra/rpl_tests/rpl_deadlock.test 2006-11-15 10:31:30 +01:00 @@ -10,14 +10,13 @@ # We don't 'show status like 'slave_retried_transactions'' because this # is not repeatable (depends on sleeps). -source include/have_innodb.inc; -source include/master-slave.inc; +-- source include/master-slave.inc connection master; -create table t1 (a int not null, key(a)) engine=innodb; -create table t2 (a int not null, key(a)) engine=innodb; -create table t3 (a int) engine=innodb; -create table t4 (a int) engine=innodb; +eval CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=$engine_type; +eval CREATE TABLE t2 (a INT NOT NULL, KEY(a)) ENGINE=$engine_type; +eval CREATE TABLE t3 (a INT) ENGINE=$engine_type; +eval CREATE TABLE t4 (a INT) ENGINE=$engine_type; show variables like 'slave_transaction_retries'; sync_slave_with_master; @@ -65,7 +64,7 @@ sync_with_master; select * from t1; # check that slave succeeded finally select * from t2; # check that no error is reported ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # --replace_result $MASTER_MYPORT MASTER_MYPORT --vertical_results show slave status; @@ -74,7 +73,7 @@ show slave status; # 2) Test lock wait timeout stop slave; -change master to master_log_pos=532; # the BEGIN log event +change master to master_log_pos=536; # the BEGIN log event begin; select * from t2 for update; # hold lock start slave; @@ -84,7 +83,7 @@ sync_with_master; select * from t1; # check that slave succeeded finally select * from t2; # check that no error is reported ---replace_column 1 # 8 # 9 # 11 # 23 # 33 # +--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 # --replace_result $MASTER_MYPORT MASTER_MYPORT --vertical_results show slave status; @@ -97,7 +96,7 @@ set global max_relay_log_size=0; # This is really copy-paste of 2) of above stop slave; -change master to master_log_pos=532; +change master to master_log_pos=536; begin; select * from t2 for update; start slave; @@ -106,7 +105,7 @@ commit; sync_with_master; select * from t1; select * from t2; ---replace_column 1 # 8 # 9 # 11 # 23 # 33 # +--replace_column 1 # 7 # 8 # 9 # 11 # 16 # 22 # 23 # 33 # --replace_result $MASTER_MYPORT MASTER_MYPORT --vertical_results show slave status; --- 1.16.4.1/mysql-test/t/rpl_max_relay_size.test 2006-11-15 10:31:30 +01:00 +++ 1.21/mysql-test/extra/rpl_tests/rpl_max_relay_size.test 2006-11-15 10:31:30 +01:00 @@ -3,7 +3,9 @@ # for relay logs too). # Test of manual relay log rotation with FLUSH LOGS. -source include/master-slave.inc; +# Requires statement logging +-- source include/master-slave.inc + connection slave; stop slave; connection master; @@ -39,7 +41,7 @@ select @@global.max_relay_log_size; start slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # --vertical_results show slave status; @@ -54,7 +56,7 @@ select @@global.max_relay_log_size; start slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # --vertical_results show slave status; @@ -69,7 +71,7 @@ select @@global.max_relay_log_size; start slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # --vertical_results show slave status; @@ -83,7 +85,7 @@ reset slave; # (to make sure it does not crash). flush logs; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # --vertical_results show slave status; @@ -104,7 +106,7 @@ save_master_pos; connection slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # --vertical_results show slave status; @@ -119,13 +121,14 @@ save_master_pos; connection slave; sync_with_master; --replace_result $MASTER_MYPORT MASTER_PORT ---replace_column 1 # 8 # 9 # 23 # 33 # +--replace_column 1 # 8 # 9 # 16 # 23 # 33 # --vertical_results show slave status; connection master; # test that the absence of relay logs does not make a master crash flush logs; +-- replace_column 3 <Binlog_Ignore_DB> show master status; # Restore max_binlog_size --- 1.4/mysql-test/r/rpl_variables.result 2006-11-15 10:31:30 +01:00 +++ 1.5/mysql-test/r/rpl_variables.result 2006-11-15 10:31:30 +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; +set @my_slave_net_timeout =@@global.slave_net_timeout; set global slave_net_timeout=100; set global sql_slave_skip_counter=100; show variables like 'slave_compressed_protocol'; --- 1.25/mysql-test/r/view_grant.result 2006-11-15 10:31:30 +01:00 +++ 1.26/mysql-test/r/view_grant.result 2006-11-15 10:31:30 +01:00 @@ -546,13 +546,13 @@ CREATE SQL SECURITY DEFINER VIEW mysqlte CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tus AS SELECT * FROM mysqltest1.t1; CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_td AS SELECT * FROM mysqltest1.t1; CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tds AS SELECT * FROM mysqltest1.t1; -GRANT SELECT, INSERT, UPDATE, DELETE ON mysqltest1.v_t1 TO readonly; -GRANT SELECT ON mysqltest1.v_ts TO readonly; -GRANT INSERT ON mysqltest1.v_ti TO readonly; -GRANT UPDATE ON mysqltest1.v_tu TO readonly; -GRANT UPDATE,SELECT ON mysqltest1.v_tus TO readonly; -GRANT DELETE ON mysqltest1.v_td TO readonly; -GRANT DELETE,SELECT ON mysqltest1.v_tds TO readonly; +GRANT SELECT, INSERT, UPDATE, DELETE ON mysqltest1.v_t1 TO readonly@localhost; +GRANT SELECT ON mysqltest1.v_ts TO readonly@localhost; +GRANT INSERT ON mysqltest1.v_ti TO readonly@localhost; +GRANT UPDATE ON mysqltest1.v_tu TO readonly@localhost; +GRANT UPDATE,SELECT ON mysqltest1.v_tus TO readonly@localhost; +GRANT DELETE ON mysqltest1.v_td TO readonly@localhost; +GRANT DELETE,SELECT ON mysqltest1.v_tds TO readonly@localhost; SELECT * FROM mysqltest1.v_t1; ERROR HY000: View 'mysqltest1.v_t1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them INSERT INTO mysqltest1.v_t1 VALUES(4); --- 1.5/mysql-test/t/rpl_variables.test 2006-11-15 10:31:30 +01:00 +++ 1.6/mysql-test/t/rpl_variables.test 2006-11-15 10:31:30 +01:00 @@ -1,5 +1,8 @@ source include/master-slave.inc; +# Init for rstore of variable values +set @my_slave_net_timeout =@@global.slave_net_timeout; + set global slave_net_timeout=100; set global sql_slave_skip_counter=100; --- 1.22/mysql-test/t/view_grant.test 2006-11-15 10:31:30 +01:00 +++ 1.23/mysql-test/t/view_grant.test 2006-11-15 10:31:30 +01:00 @@ -733,13 +733,13 @@ CREATE SQL SECURITY DEFINER VIEW mysqlte CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tus AS SELECT * FROM mysqltest1.t1; CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_td AS SELECT * FROM mysqltest1.t1; CREATE SQL SECURITY DEFINER VIEW mysqltest1.v_tds AS SELECT * FROM mysqltest1.t1; -GRANT SELECT, INSERT, UPDATE, DELETE ON mysqltest1.v_t1 TO readonly; -GRANT SELECT ON mysqltest1.v_ts TO readonly; -GRANT INSERT ON mysqltest1.v_ti TO readonly; -GRANT UPDATE ON mysqltest1.v_tu TO readonly; -GRANT UPDATE,SELECT ON mysqltest1.v_tus TO readonly; -GRANT DELETE ON mysqltest1.v_td TO readonly; -GRANT DELETE,SELECT ON mysqltest1.v_tds TO readonly; +GRANT SELECT, INSERT, UPDATE, DELETE ON mysqltest1.v_t1 TO readonly@localhost; +GRANT SELECT ON mysqltest1.v_ts TO readonly@localhost; +GRANT INSERT ON mysqltest1.v_ti TO readonly@localhost; +GRANT UPDATE ON mysqltest1.v_tu TO readonly@localhost; +GRANT UPDATE,SELECT ON mysqltest1.v_tus TO readonly@localhost; +GRANT DELETE ON mysqltest1.v_td TO readonly@localhost; +GRANT DELETE,SELECT ON mysqltest1.v_tds TO readonly@localhost; CONNECT (n1,localhost,readonly,,); CONNECTION n1; @@ -797,7 +797,7 @@ DROP VIEW mysqltest1.v_ti; DROP VIEW mysqltest1.v_ts; DROP VIEW mysqltest1.v_t1; DROP TABLE mysqltest1.t1; -DROP USER readonly@localhost; +DROP USER readonly@localhost; DROP DATABASE mysqltest1; # --- 1.49/mysql-test/r/type_float.result 2006-11-15 10:31:30 +01:00 +++ 1.50/mysql-test/r/type_float.result 2006-11-15 10:31:30 +01:00 @@ -264,7 +264,7 @@ a decimal(21,2) NO 0.00 drop table t1,t2,t3; select 1e-308, 1.00000001e-300, 100000000e-300; 1e-308 1.00000001e-300 100000000e-300 -0 1.00000001e-300 1e-292 +1e-308 1.00000001e-300 1e-292 select 10e307; 10e307 1e+308 --- 1.20/mysql-test/r/key_cache.result 2006-11-15 10:31:30 +01:00 +++ 1.21/mysql-test/r/key_cache.result 2006-11-15 10:31:30 +01:00 @@ -284,12 +284,15 @@ insert t1 values ('aaabbb'); check table t1; Table Op Msg_type Msg_text test.t1 check status OK +set @my_key_cache_block_size= @@global.key_cache_block_size; set GLOBAL key_cache_block_size=2048; check table t1; Table Op Msg_type Msg_text test.t1 check status OK drop table t1; +set global key_cache_block_size= @my_key_cache_block_size; CREATE TABLE t1(a int NOT NULL AUTO_INCREMENT PRIMARY KEY); +SET @my_key_cache_block_size= @@global.key_cache_block_size; SET GLOBAL key_cache_block_size=1536; INSERT INTO t1 VALUES (1); SELECT @@key_cache_block_size; @@ -331,6 +334,7 @@ CHECK TABLE t1; Table Op Msg_type Msg_text test.t1 check status OK DROP TABLE t1,t2; +set global key_cache_block_size= @my_key_cache_block_size; set @@global.key_buffer_size=0; Warnings: Warning 1438 Cannot drop default keycache --- 1.133/mysql-test/r/mysqldump.result 2006-11-15 10:31:30 +01:00 +++ 1.134/mysql-test/r/mysqldump.result 2006-11-15 10:31:30 +01:00 @@ -3088,7 +3088,7 @@ drop user mysqltest_1@localhost; # create database mysqldump_myDB; use mysqldump_myDB; -create user myDB_User; +create user myDB_User@localhost; grant create, create view, select, insert on mysqldump_myDB.* to myDB_User@localhost; create table t1 (c1 int); insert into t1 values (3); @@ -3101,7 +3101,7 @@ drop view v1; drop table t1; drop table u1; revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; -drop user myDB_User; +drop user myDB_User@localhost; drop database mysqldump_myDB; flush privileges; # Bug #21424 continues from here. @@ -3119,9 +3119,10 @@ drop view v1; drop table t1; drop table u1; revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; -drop user myDB_User; +drop user myDB_User@localhost; drop database mysqldump_myDB; use test; + # # BUG#13926: --order-by-primary fails if PKEY contains quote character # --- 1.124/mysql-test/t/mysqldump.test 2006-11-15 10:31:30 +01:00 +++ 1.125/mysql-test/t/mysqldump.test 2006-11-15 10:31:30 +01:00 @@ -1343,7 +1343,7 @@ connect (root,localhost,root,,test,$MAST connection root; create database mysqldump_myDB; use mysqldump_myDB; -create user myDB_User; +create user myDB_User@localhost; grant create, create view, select, insert on mysqldump_myDB.* to myDB_User@localhost; create table t1 (c1 int); insert into t1 values (3); @@ -1366,7 +1366,7 @@ drop view v1; drop table t1; drop table u1; revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; -drop user myDB_User; +drop user myDB_User@localhost; drop database mysqldump_myDB; flush privileges; @@ -1391,7 +1391,7 @@ drop view v1; drop table t1; drop table u1; revoke all privileges on mysqldump_myDB.* from myDB_User@localhost; -drop user myDB_User; +drop user myDB_User@localhost; drop database mysqldump_myDB; use test; --- 1.8/mysql-test/r/rpl_drop_db.result 2006-11-15 10:31:30 +01:00 +++ 1.9/mysql-test/r/rpl_drop_db.result 2006-11-15 10:31:30 +01:00 @@ -33,5 +33,7 @@ n 1234 DROP DATABASE mysqltest1; stop slave; +drop database mysqltest1; +drop database mysqltest1; use test; drop table t1; --- 1.12/mysql-test/t/rpl_drop_db.test 2006-11-15 10:31:30 +01:00 +++ 1.13/mysql-test/t/rpl_drop_db.test 2006-11-15 10:31:30 +01:00 @@ -54,9 +54,13 @@ sync_slave_with_master; #cleanup connection slave; stop slave; -#system rm -rf $MYSQLTEST_VARDIR/master-data/mysqltest1; +drop database mysqltest1; connection master; +# Remove the "extra" file created above +--remove_file $MYSQLTEST_VARDIR/master-data/mysqltest1/f1.txt +drop database mysqltest1; + use test; drop table t1;
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (msvensson:1.2365) | msvensson | 15 Nov |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.678 sec. using MySQL 5.1.14-beta-log