Below is the list of changes that have just been committed into a local
5.0 repository of guilhem. When guilhem 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
1.1977 05/11/16 11:37:42 guilhem@stripped +5 -0
1) fixes after merge 2) fix for failure of sp-security: a GRANT in rpl_row_USER influenced the
privileges in sp-security. Only binlog_stm_mix_innodb_myisam fails now, as usual (this will have to be fixed before the push into 5.1 btw).
sql/share/errmsg.txt
1.57 05/11/16 11:37:38 guilhem@stripped +2 -0
fix after merge
mysql-test/t/rpl_row_USER.test
1.6 05/11/16 11:37:38 guilhem@stripped +20 -17
clean up the GRANT at the end of the test otherwise it makes sp-security fail.
Use mysqltest1 instead of "test" to be less intrusive in user's setup (we assume user
can run the testsuite against an existing server having a "test" database).
mysql-test/r/user_var-binlog.result
1.7 05/11/16 11:37:38 guilhem@stripped +1 -1
result update (correcting old merge)
mysql-test/r/rpl_row_USER.result
1.2 05/11/16 11:37:38 guilhem@stripped +16 -19
result update
mysql-test/r/binlog_stm_innodb_stat.result
1.4 05/11/16 11:37:38 guilhem@stripped +1 -0
result update
# 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: guilhem
# Host: gbichot3.local
# Root: /home/mysql_src/mysql-5.0-wl1012
--- 1.56/sql/share/errmsg.txt 2005-11-15 23:14:47 +01:00
+++ 1.57/sql/share/errmsg.txt 2005-11-16 11:37:38 +01:00
@@ -5427,4 +5427,6 @@
eng "Writing one row to the row-based binary log failed"
ER_BINLOG_ROW_WRONG_TABLE_DEF
eng "Table definition on master and slave does not match"
+ER_BINLOG_ROW_RBR_TO_SBR
+ eng "Slave running with --log-slave-updates must use row-based binary logging to be able to replicate row-based binary log events"
--- 1.6/mysql-test/r/user_var-binlog.result 2005-10-26 19:57:31 +02:00
+++ 1.7/mysql-test/r/user_var-binlog.result 2005-11-16 11:37:38 +01:00
@@ -11,7 +11,7 @@
master-bin.000001 # User var 1 # @`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
master-bin.000001 # Query 1 # use `test`; INSERT INTO t1 VALUES(@`a b`)
master-bin.000001 # User var 1 # @`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
-master-bin.000001 # User var 1 # @`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
+master-bin.000001 # User var 1 # @`var2`=_binary 0x61 COLLATE binary
master-bin.000001 # Query 1 # use `test`; insert into t1 values (@var1),(@var2)
/*!40019 SET @@session.max_insert_delayed_threads=0*/;
/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
--- 1.5/mysql-test/t/rpl_row_USER.test 2005-09-30 15:54:14 +02:00
+++ 1.6/mysql-test/t/rpl_row_USER.test 2005-11-16 11:37:38 +01:00
@@ -11,41 +11,44 @@
# Begin clean up test section
connection master;
-DROP PROCEDURE IF EXISTS test.p1;
-DROP TABLE IF EXISTS test.t1;
-
+--disable_warnings
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
--enable_warnings
# Section 1 test
CREATE USER tester IDENTIFIED BY 'test';
-GRANT ALL ON test.* TO 'tester'@'%' IDENTIFIED BY 'test';
-GRANT ALL ON test.* TO ''@'localhost%';
+GRANT ALL ON mysqltest1.* TO 'tester'@'%' IDENTIFIED BY 'test';
+GRANT ALL ON mysqltest1.* TO ''@'localhost%';
FLUSH PRIVILEGES;
-connect (m_1,localhost,tester,,test);
+connect (m_1,localhost,tester,,mysqltest1);
connection m_1;
-CREATE TABLE test.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
-INSERT INTO test.t1 VALUES(1,USER());
-INSERT INTO test.t1 VALUES(2,CURRENT_USER());
+CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
+INSERT INTO mysqltest1.t1 VALUES(1,USER());
+INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER());
delimiter |;
-create procedure test.p1()
+create procedure mysqltest1.p1()
begin
- INSERT INTO test.t1 VALUES(3,USER());
- INSERT INTO test.t1 VALUES(4,CURRENT_USER());
+ INSERT INTO mysqltest1.t1 VALUES(3,USER());
+ INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
end|
delimiter ;|
-CALL test.p1();
+CALL mysqltest1.p1();
connection master;
-SELECT * FROM test.t1;
+SELECT * FROM mysqltest1.t1;
sync_slave_with_master;
-SELECT * FROM test.t1;
+SELECT * FROM mysqltest1.t1;
connection master;
# Lets cleanup
#show binlog events;
-DROP PROCEDURE IF EXISTS test.p1;
-DROP TABLE test.t1;
+DROP DATABASE mysqltest1;
+REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
+REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
+
+sync_slave_with_master;
# End of 5.0 test case
--- 1.3/mysql-test/r/binlog_stm_innodb_stat.result 2005-09-19 23:49:00 +02:00
+++ 1.4/mysql-test/r/binlog_stm_innodb_stat.result 2005-11-16 11:37:38 +01:00
@@ -4,6 +4,7 @@
show status like "binlog_cache_disk_use";
Variable_name Value
Binlog_cache_disk_use 0
+drop table if exists t1;
create table t1 (a int) engine=innodb;
show status like "binlog_cache_use";
Variable_name Value
--- 1.1/mysql-test/r/rpl_row_USER.result 2005-09-30 15:54:14 +02:00
+++ 1.2/mysql-test/r/rpl_row_USER.result 2005-11-16 11:37:38 +01:00
@@ -4,36 +4,33 @@
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
-DROP PROCEDURE IF EXISTS test.p1;
-Warnings:
-Note 1305 PROCEDURE p1 does not exist
-DROP TABLE IF EXISTS test.t1;
-Warnings:
-Note 1051 Unknown table 't1'
+DROP DATABASE IF EXISTS mysqltest1;
+CREATE DATABASE mysqltest1;
CREATE USER tester IDENTIFIED BY 'test';
-GRANT ALL ON test.* TO 'tester'@'%' IDENTIFIED BY 'test';
-GRANT ALL ON test.* TO ''@'localhost%';
+GRANT ALL ON mysqltest1.* TO 'tester'@'%' IDENTIFIED BY 'test';
+GRANT ALL ON mysqltest1.* TO ''@'localhost%';
FLUSH PRIVILEGES;
-CREATE TABLE test.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
-INSERT INTO test.t1 VALUES(1,USER());
-INSERT INTO test.t1 VALUES(2,CURRENT_USER());
-create procedure test.p1()
+CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a));
+INSERT INTO mysqltest1.t1 VALUES(1,USER());
+INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER());
+create procedure mysqltest1.p1()
begin
-INSERT INTO test.t1 VALUES(3,USER());
-INSERT INTO test.t1 VALUES(4,CURRENT_USER());
+INSERT INTO mysqltest1.t1 VALUES(3,USER());
+INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER());
end|
-CALL test.p1();
-SELECT * FROM test.t1;
+CALL mysqltest1.p1();
+SELECT * FROM mysqltest1.t1;
a users
1 tester@localhost
2 @localhost
3 tester@localhost
4 @localhost
-SELECT * FROM test.t1;
+SELECT * FROM mysqltest1.t1;
a users
1 tester@localhost
2 @localhost
3 tester@localhost
4 @localhost
-DROP PROCEDURE IF EXISTS test.p1;
-DROP TABLE test.t1;
+DROP DATABASE mysqltest1;
+REVOKE ALL ON mysqltest1.* FROM 'tester'@'%';
+REVOKE ALL ON mysqltest1.* FROM ''@'localhost%';
| Thread |
|---|
| • bk commit into 5.0 tree (guilhem:1.1977) | guilhem | 16 Nov |
