Commit 4e0cace2 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/extra/rpl_tests/rpl_deadlock.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
  Auto merged
mysql-test/r/key_cache.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_timezone.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/init_connect.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/r/mysqldump.result:
  Manual merge
mysql-test/r/rpl_drop_db.result:
  Manual merge
mysql-test/r/rpl_variables.result:
  Manual merge
mysql-test/t/rpl_drop_db.test:
  Manual merge
mysql-test/t/rpl_sp.test:
  Manual merge
mysql-test/t/rpl_timezone.test:
  Manual merge
mysql-test/t/rpl_variables.test:
  Manual merge
parents 37b4ad8c 8b8647ff

mysql-test/extra/rpl_tests/rpl_deadlock.test

+2 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ show slave status; 


# Now we repeat 2), but with BEGIN in the same relay log as

# COMMIT (to see if seeking into hot log is ok).



set @my_max_relay_log_size= @@global.max_relay_log_size;

set global max_relay_log_size=0;



# This is really copy-paste of 2) of above
@@ -114,5 +114,6 @@ show slave status; 
connection master;

drop table t1,t2,t3,t4;

sync_slave_with_master;

set global max_relay_log_size= @my_max_relay_log_size;



# End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_max_relay_size.test

+5 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ reset slave; 
--echo # Test 1

--echo #



set @my_max_binlog_size= @@global.max_binlog_size;

set global max_binlog_size=8192;

set global max_relay_log_size=8192-1; # mapped to 4096

select @@global.max_relay_log_size;
@@ -130,6 +131,10 @@ flush logs; 
-- replace_column 3 <Binlog_Ignore_DB>

show master status;



# Restore max_binlog_size

connection slave;

set global max_binlog_size= @my_max_binlog_size;



--echo #

--echo # End of 4.1 tests

--echo #

mysql-test/r/init_connect.result

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ x 
17

19

drop trigger trg1;

set global init_connect=default;

set global init_connect="set @a='a\\0c'";

revoke all privileges, grant option from mysqltest1@localhost;

drop user mysqltest1@localhost;

drop table t1, t2;

mysql-test/r/key_cache.result

+4 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/r/limit.result

+1 −0
Original line number Diff line number Diff line
@@ -90,3 +90,4 @@ id select_type table type possible_keys key key_len ref rows Extra 
select sum(a) c FROM t1 WHERE a > 0 ORDER BY c LIMIT 3;

c

28

drop table t1;