Commit 6c6e0690 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration


mysql-test/t/trigger-grant.test:
  Merge
parents 9815d9ae e4317041

mysql-test/r/rpl_ignore_table.result

0 → 100644
+16 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

**** Test case for BUG#16487 ****

**** Master ****

CREATE TABLE test.t4 (a int);

CREATE TABLE test.t1 (a int);

UPDATE test.t4 NATURAL JOIN test.t1 SET t1.a=5;

**** Slave ****

SELECT * FROM t4;

a

DROP TABLE t1;

DROP TABLE t4;

mysql-test/r/trigger-grant.result

+184 −103
Original line number Diff line number Diff line
@@ -65,109 +65,6 @@ user_str 
mysqltest_dfn@localhost

mysqltest_dfn@localhost



---> connection: default

use mysqltest_db1;

REVOKE SELECT ON mysqltest_db1.t1 FROM mysqltest_dfn@localhost;



---> connection: wl2818_definer_con

use mysqltest_db1;

DROP TRIGGER trg1;

SET @new_sum = 0;

SET @old_sum = 0;

---> INSERT INTO statement; BEFORE timing

CREATE TRIGGER trg1 BEFORE INSERT ON t1

FOR EACH ROW

SET @new_sum = @new_sum + NEW.num_value;

INSERT INTO t1 VALUES(4);

ERROR 42000: SELECT command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> INSERT INTO statement; AFTER timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 AFTER INSERT ON t1

FOR EACH ROW

SET @new_sum = @new_sum + NEW.num_value;

INSERT INTO t1 VALUES(5);

ERROR 42000: SELECT command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> UPDATE statement; BEFORE timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 BEFORE UPDATE ON t1

FOR EACH ROW

SET @old_sum = @old_sum + OLD.num_value;

UPDATE t1 SET num_value = 10;

ERROR 42000: SELECT command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> UPDATE statement; AFTER timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 AFTER UPDATE ON t1

FOR EACH ROW

SET @new_sum = @new_sum + NEW.num_value;

UPDATE t1 SET num_value = 20;

ERROR 42000: SELECT command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> DELETE statement; BEFORE timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 BEFORE DELETE ON t1

FOR EACH ROW

SET @old_sum = @old_sum + OLD.num_value;

DELETE FROM t1;

ERROR 42000: SELECT command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> DELETE statement; AFTER timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 AFTER DELETE ON t1

FOR EACH ROW

SET @old_sum = @old_sum + OLD.num_value;

DELETE FROM t1;

ERROR 42000: SELECT command denied to user 'mysqltest_dfn'@'localhost' for table 't1'



---> connection: default

use mysqltest_db1;

GRANT SELECT ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;

REVOKE UPDATE ON mysqltest_db1.t1 FROM mysqltest_dfn@localhost;



---> connection: wl2818_definer_con

use mysqltest_db1;

DROP TRIGGER trg1;

SET @new_sum = 0;

SET @old_sum = 0;

---> INSERT INTO statement; BEFORE timing

CREATE TRIGGER trg1 BEFORE INSERT ON t1

FOR EACH ROW

SET @new_sum = @new_sum + NEW.num_value;

INSERT INTO t1 VALUES(4);

ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> INSERT INTO statement; AFTER timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 AFTER INSERT ON t1

FOR EACH ROW

SET @new_sum = @new_sum + NEW.num_value;

INSERT INTO t1 VALUES(5);

ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> UPDATE statement; BEFORE timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 BEFORE UPDATE ON t1

FOR EACH ROW

SET @old_sum = @old_sum + OLD.num_value;

UPDATE t1 SET num_value = 10;

ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> UPDATE statement; AFTER timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 AFTER UPDATE ON t1

FOR EACH ROW

SET @new_sum = @new_sum + NEW.num_value;

UPDATE t1 SET num_value = 20;

ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> DELETE statement; BEFORE timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 BEFORE DELETE ON t1

FOR EACH ROW

SET @old_sum = @old_sum + OLD.num_value;

DELETE FROM t1;

ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for table 't1'

---> DELETE statement; AFTER timing

DROP TRIGGER trg1;

CREATE TRIGGER trg1 AFTER DELETE ON t1

FOR EACH ROW

SET @old_sum = @old_sum + OLD.num_value;

DELETE FROM t1;

ERROR 42000: UPDATE command denied to user 'mysqltest_dfn'@'localhost' for table 't1'



---> connection: wl2818_definer_con

use mysqltest_db1;

DROP TRIGGER trg1;
@@ -229,3 +126,187 @@ DROP USER mysqltest_inv@localhost; 
DROP DATABASE mysqltest_db1;

Warnings:

Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger.

DELETE FROM mysql.user WHERE User LIKE 'mysqltest_%';

DELETE FROM mysql.db WHERE User LIKE 'mysqltest_%';

DELETE FROM mysql.tables_priv WHERE User LIKE 'mysqltest_%';

DELETE FROM mysql.columns_priv WHERE User LIKE 'mysqltest_%';

FLUSH PRIVILEGES;

DROP DATABASE IF EXISTS mysqltest_db1;

CREATE DATABASE mysqltest_db1;

use mysqltest_db1;

CREATE TABLE t1(col CHAR(20));

CREATE TABLE t2(col CHAR(20));

CREATE TABLE t3(col CHAR(20));

CREATE TABLE t4(col CHAR(20));

CREATE USER mysqltest_u1@localhost;

REVOKE ALL PRIVILEGES, GRANT OPTION FROM mysqltest_u1@localhost;

GRANT SUPER ON *.* TO mysqltest_u1@localhost;

GRANT SELECT ON mysqltest_db1.t1 TO mysqltest_u1@localhost;

SET @mysqltest_var = NULL;



---> connection: default

use mysqltest_db1;

REVOKE SELECT ON mysqltest_db1.t1 FROM mysqltest_u1@localhost;

GRANT DELETE ON mysqltest_db1.* TO mysqltest_u1@localhost;

SHOW GRANTS FOR mysqltest_u1@localhost;

Grants for mysqltest_u1@localhost

GRANT SUPER ON *.* TO 'mysqltest_u1'@'localhost'

GRANT DELETE ON `mysqltest_db1`.* TO 'mysqltest_u1'@'localhost'



---> connection: bug15166_u1_con

use mysqltest_db1;

CREATE TRIGGER t1_trg_after_delete AFTER DELETE ON t1

FOR EACH ROW

SET @mysqltest_var = 'Hello, world!';



---> connection: default

use mysqltest_db1;

GRANT UPDATE ON mysqltest_db1.t1 TO mysqltest_u1@localhost;

GRANT UPDATE ON mysqltest_db1.t2 TO mysqltest_u1@localhost;

GRANT UPDATE(col) ON mysqltest_db1.t3 TO mysqltest_u1@localhost;

GRANT UPDATE(col) ON mysqltest_db1.t4 TO mysqltest_u1@localhost;



---> connection: bug15166_u1_con

use mysqltest_db1;

CREATE TRIGGER t1_trg_err_1 BEFORE INSERT ON t1

FOR EACH ROW

SET @mysqltest_var = NEW.col;

DROP TRIGGER t1_trg_err_1;

CREATE TRIGGER t1_trg_err_2 BEFORE DELETE ON t1

FOR EACH ROW

SET @mysqltest_var = OLD.col;

DROP TRIGGER t1_trg_err_2;

CREATE TRIGGER t2_trg_before_insert BEFORE INSERT ON t2

FOR EACH ROW

SET NEW.col = 't2_trg_before_insert';

CREATE TRIGGER t3_trg_err_1 BEFORE INSERT ON t3

FOR EACH ROW

SET @mysqltest_var = NEW.col;

DROP TRIGGER t3_trg_err_1;

CREATE TRIGGER t3_trg_err_2 BEFORE DELETE ON t3

FOR EACH ROW

SET @mysqltest_var = OLD.col;

DROP TRIGGER t3_trg_err_2;

CREATE TRIGGER t4_trg_before_insert BEFORE INSERT ON t4

FOR EACH ROW

SET NEW.col = 't4_trg_before_insert';



---> connection: default

use mysqltest_db1;

REVOKE UPDATE ON mysqltest_db1.t1 FROM mysqltest_u1@localhost;

REVOKE UPDATE ON mysqltest_db1.t2 FROM mysqltest_u1@localhost;

GRANT SELECT ON mysqltest_db1.t1 TO mysqltest_u1@localhost;

GRANT SELECT ON mysqltest_db1.t2 TO mysqltest_u1@localhost;

REVOKE UPDATE(col) ON mysqltest_db1.t3 FROM mysqltest_u1@localhost;

REVOKE UPDATE(col) ON mysqltest_db1.t4 FROM mysqltest_u1@localhost;

GRANT SELECT(col) on mysqltest_db1.t3 TO mysqltest_u1@localhost;

GRANT SELECT(col) on mysqltest_db1.t4 TO mysqltest_u1@localhost;



---> connection: bug15166_u1_con

use mysqltest_db1;

CREATE TRIGGER t1_trg_after_insert AFTER INSERT ON t1

FOR EACH ROW

SET @mysqltest_var = NEW.col;

CREATE TRIGGER t1_trg_after_update AFTER UPDATE ON t1

FOR EACH ROW

SET @mysqltest_var = OLD.col;

CREATE TRIGGER t2_trg_err_1 BEFORE UPDATE ON t2

FOR EACH ROW

SET NEW.col = 't2_trg_err_1';

DROP TRIGGER t2_trg_err_1;

CREATE TRIGGER t2_trg_err_2 BEFORE UPDATE ON t2

FOR EACH ROW

SET NEW.col = CONCAT(OLD.col, '(updated)');

DROP TRIGGER t2_trg_err_2;

CREATE TRIGGER t3_trg_after_insert AFTER INSERT ON t3

FOR EACH ROW

SET @mysqltest_var = NEW.col;

CREATE TRIGGER t3_trg_after_update AFTER UPDATE ON t3

FOR EACH ROW

SET @mysqltest_var = OLD.col;

CREATE TRIGGER t4_trg_err_1 BEFORE UPDATE ON t4

FOR EACH ROW

SET NEW.col = 't4_trg_err_1';

DROP TRIGGER t4_trg_err_1;

CREATE TRIGGER t4_trg_err_2 BEFORE UPDATE ON t4

FOR EACH ROW

SET NEW.col = CONCAT(OLD.col, '(updated)');

DROP TRIGGER t4_trg_err_2;



---> connection: default

use mysqltest_db1;

REVOKE SELECT ON mysqltest_db1.t1 FROM mysqltest_u1@localhost;

REVOKE SELECT ON mysqltest_db1.t2 FROM mysqltest_u1@localhost;

GRANT UPDATE ON mysqltest_db1.t1 TO mysqltest_u1@localhost;

GRANT UPDATE ON mysqltest_db1.t2 TO mysqltest_u1@localhost;

REVOKE SELECT(col) ON mysqltest_db1.t3 FROM mysqltest_u1@localhost;

REVOKE SELECT(col) ON mysqltest_db1.t4 FROM mysqltest_u1@localhost;

GRANT UPDATE(col) ON mysqltest_db1.t3 TO mysqltest_u1@localhost;

GRANT UPDATE(col) ON mysqltest_db1.t4 TO mysqltest_u1@localhost;

INSERT INTO t1 VALUES('line1');

ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for column 'col' in table 't1'

SELECT * FROM t1;

col

line1

SELECT @mysqltest_var;

@mysqltest_var

NULL

INSERT INTO t2 VALUES('line2');

SELECT * FROM t2;

col

t2_trg_before_insert

INSERT INTO t3 VALUES('t3_line1');

ERROR 42000: SELECT command denied to user 'mysqltest_u1'@'localhost' for column 'col' in table 't3'

SELECT * FROM t3;

col

t3_line1

SELECT @mysqltest_var;

@mysqltest_var

NULL

INSERT INTO t4 VALUES('t4_line2');

SELECT * FROM t4;

col

t4_trg_before_insert



---> connection: default

use mysqltest_db1;

REVOKE UPDATE ON mysqltest_db1.t1 FROM mysqltest_u1@localhost;

REVOKE UPDATE ON mysqltest_db1.t2 FROM mysqltest_u1@localhost;

GRANT SELECT ON mysqltest_db1.t1 TO mysqltest_u1@localhost;

GRANT SELECT ON mysqltest_db1.t2 TO mysqltest_u1@localhost;

REVOKE UPDATE(col) ON mysqltest_db1.t3 FROM mysqltest_u1@localhost;

REVOKE UPDATE(col) ON mysqltest_db1.t4 FROM mysqltest_u1@localhost;

GRANT SELECT(col) ON mysqltest_db1.t3 TO mysqltest_u1@localhost;

GRANT SELECT(col) ON mysqltest_db1.t4 TO mysqltest_u1@localhost;

INSERT INTO t1 VALUES('line3');

SELECT * FROM t1;

col

line1

line3

SELECT @mysqltest_var;

@mysqltest_var

line3

INSERT INTO t2 VALUES('line4');

ERROR 42000: UPDATE command denied to user 'mysqltest_u1'@'localhost' for column 'col' in table 't2'

SELECT * FROM t2;

col

t2_trg_before_insert

INSERT INTO t3 VALUES('t3_line2');

SELECT * FROM t3;

col

t3_line1

t3_line2

SELECT @mysqltest_var;

@mysqltest_var

t3_line2

INSERT INTO t4 VALUES('t4_line2');

ERROR 42000: UPDATE command denied to user 'mysqltest_u1'@'localhost' for column 'col' in table 't4'

SELECT * FROM t4;

col

t4_trg_before_insert

DELETE FROM t1;

SELECT @mysqltest_var;

@mysqltest_var

Hello, world!

DROP USER mysqltest_u1@localhost;

DROP DATABASE mysqltest_db1;

mysql-test/t/ctype_ucs.test

+2 −0
Original line number Diff line number Diff line
@@ -424,7 +424,9 @@ drop table t1; 
#

# Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation

#

--disable_warnings

create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;

--enable_warnings

insert into t1 values('a');

create index t1f1 on t1(f1);

select f1 from t1 where f1 like 'a%';

mysql-test/t/rpl_ignore_table-slave.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--replicate-ignore-table=test.t1 --replicate-ignore-table=test.t2 --replicate-ignore-table=test.t3

mysql-test/t/rpl_ignore_table.test

0 → 100644
+28 −0
Original line number Diff line number Diff line 
source include/master-slave.inc;



#

# BUG#16487

#  

# Requirement:

# Multi-updates on ignored tables should not fail even if the slave does 

# not have the ignored tables.

#

# Note table t1, t2, and t3 are ignored in the option file to this test.

#



--echo **** Test case for BUG#16487 ****

--echo **** Master ****

connection master;

CREATE TABLE test.t4 (a int);

CREATE TABLE test.t1 (a int);



# Expect: The row must *not* by updated on slave, since t1 is ignored

UPDATE test.t4 NATURAL JOIN test.t1 SET t1.a=5;



--echo **** Slave ****

sync_slave_with_master;

SELECT * FROM t4;



connection master;

DROP TABLE t1;

DROP TABLE t4;