Commit 48d4d50c authored by unknown's avatar unknown
Browse files

Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build 

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


client/mysqlbinlog.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/r/view_grant.result:
  merged
mysql-test/t/view_grant.test:
  merged
parents c62c0d9d ddb23beb

client/mysqlbinlog.cc

+11 −4
Original line number Diff line number Diff line
@@ -1042,7 +1042,7 @@ static int dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info, 
  uint logname_len;

  NET* net;

  int error= 0;

  my_off_t old_off= start_position_mot;

  my_off_t old_off= min(start_position_mot, BIN_LOG_HEADER_SIZE);

  char fname[FN_REFLEN+1];

  DBUG_ENTER("dump_remote_log_entries");
@@ -1195,8 +1195,15 @@ could be out of memory"); 
    }

    /*

      Let's adjust offset for remote log as for local log to produce

      similar text.

      similar text and to have --stop-position to work identically.



      Exception - the server sends Format_description_log_event

      in the beginning of the dump, and only after it the event from

      start_position. Let the old_off reflect it.

    */

    if (old_off < start_position_mot)

      old_off= start_position_mot;

    else

      old_off+= len-1;

  }

mysql-test/r/grant.result

+47 −0
Original line number Diff line number Diff line
@@ -972,4 +972,51 @@ REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij123456789 
ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)

GRANT PROCESS ON * TO user@localhost;

ERROR 3D000: No database selected

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

DROP DATABASE IF EXISTS mysqltest3;

DROP DATABASE IF EXISTS mysqltest4;

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

CREATE DATABASE mysqltest3;

CREATE DATABASE mysqltest4;

CREATE PROCEDURE mysqltest1.p_def() SQL SECURITY DEFINER

SELECT 1;

CREATE PROCEDURE mysqltest2.p_inv() SQL SECURITY INVOKER

SELECT 1;

CREATE FUNCTION mysqltest3.f_def() RETURNS INT SQL SECURITY DEFINER

RETURN 1;

CREATE FUNCTION mysqltest4.f_inv() RETURNS INT SQL SECURITY INVOKER

RETURN 1;

GRANT EXECUTE ON PROCEDURE mysqltest1.p_def TO mysqltest_1@localhost;

GRANT EXECUTE ON PROCEDURE mysqltest2.p_inv TO mysqltest_1@localhost;

GRANT EXECUTE ON FUNCTION mysqltest3.f_def TO mysqltest_1@localhost;

GRANT EXECUTE ON FUNCTION mysqltest4.f_inv TO mysqltest_1@localhost;

GRANT ALL PRIVILEGES ON test.* TO mysqltest_1@localhost;



---> connection: bug9504_con1

use mysqltest1;

use mysqltest2;

use mysqltest3;

use mysqltest4;

use test;

CALL mysqltest1.p_def();

1

1

CALL mysqltest2.p_inv();

1

1

SELECT mysqltest3.f_def();

mysqltest3.f_def()

1

SELECT mysqltest4.f_inv();

mysqltest4.f_inv()

1



---> connection: default

DROP DATABASE mysqltest1;

DROP DATABASE mysqltest2;

DROP DATABASE mysqltest3;

DROP DATABASE mysqltest4;

DROP USER mysqltest_1@localhost;

End of 5.0 tests

mysql-test/r/mysqlbinlog2.result

+36 −0
Original line number Diff line number Diff line
@@ -122,6 +122,24 @@ DELIMITER ; 
ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start and stop positions ---

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

DELIMITER /*!*/;

SET INSERT_ID=4/*!*/;

use test/*!*/;

SET TIMESTAMP=1579609946/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values(null, "d")/*!*/;

SET INSERT_ID=5/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;
@@ -481,6 +499,24 @@ DELIMITER ; 
ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start and stop positions ---

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

DELIMITER /*!*/;

SET INSERT_ID=4/*!*/;

use test/*!*/;

SET TIMESTAMP=1579609946/*!*/;

SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1/*!*/;

SET @@session.sql_mode=0/*!*/;

/*!\C latin1 *//*!*/;

SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

insert into t1 values(null, "d")/*!*/;

SET INSERT_ID=5/*!*/;

DELIMITER ;

# End of log file

ROLLBACK /* added by mysqlbinlog */;

/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;



--- start-datetime --

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

mysql-test/r/sp-security.result

+26 −9
Original line number Diff line number Diff line
@@ -8,22 +8,29 @@ create procedure db1_secret.dummy() begin end; 
drop procedure db1_secret.dummy;

use db1_secret;

create table t1 ( u varchar(64), i int );

insert into t1 values('test', 0);

create procedure stamp(i int)

insert into db1_secret.t1 values (user(), i);

show procedure status like 'stamp';

Db	Name	Type	Definer	Modified	Created	Security_type	Comment

db1_secret	stamp	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	

create function db() returns varchar(64) return database();

create function db() returns varchar(64)

begin

declare v varchar(64);

select u into v from t1 limit 1;

return v;

end|

show function status like 'db';

Db	Name	Type	Definer	Modified	Created	Security_type	Comment

db1_secret	db	FUNCTION	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	

call stamp(1);

select * from t1;

u	i

test	0

root@localhost	1

select db();

db()

db1_secret

test

grant execute on procedure db1_secret.stamp to user1@'%';

grant execute on function db1_secret.db to user1@'%';

grant execute on procedure db1_secret.stamp to ''@'%';
@@ -31,25 +38,34 @@ grant execute on function db1_secret.db to ''@'%'; 
call db1_secret.stamp(2);

select db1_secret.db();

db1_secret.db()

db1_secret

test

select * from db1_secret.t1;

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

create procedure db1_secret.dummy() begin end;

ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'

drop procedure db1_secret.dummy;

ERROR 42000: PROCEDURE db1_secret.dummy does not exist

drop procedure db1_secret.stamp;

ERROR 42000: alter routine command denied to user 'user1'@'localhost' for routine 'db1_secret.stamp'

drop function db1_secret.db;

ERROR 42000: alter routine command denied to user 'user1'@'localhost' for routine 'db1_secret.db'

call db1_secret.stamp(3);

select db1_secret.db();

db1_secret.db()

db1_secret

test

select * from db1_secret.t1;

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

create procedure db1_secret.dummy() begin end;

ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'

drop procedure db1_secret.dummy;

ERROR 42000: PROCEDURE db1_secret.dummy does not exist

drop procedure db1_secret.stamp;

ERROR 42000: alter routine command denied to user ''@'%' for routine 'db1_secret.stamp'

drop function db1_secret.db;

ERROR 42000: alter routine command denied to user ''@'%' for routine 'db1_secret.db'

select * from t1;

u	i

test	0

root@localhost	1

user1@localhost	2

anon@localhost	3
@@ -64,21 +80,22 @@ db1_secret db FUNCTION root@localhost 0000-00-00 00:00:00 0000-00-00 00:00:00 IN 
call stamp(4);

select * from t1;

u	i

test	0

root@localhost	1

user1@localhost	2

anon@localhost	3

root@localhost	4

select db();

db()

db1_secret

test

call db1_secret.stamp(5);

ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'

ERROR 42000: INSERT command denied to user 'user1'@'localhost' for table 't1'

select db1_secret.db();

ERROR 42000: Access denied for user 'user1'@'localhost' to database 'db1_secret'

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

call db1_secret.stamp(6);

ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'

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

select db1_secret.db();

ERROR 42000: Access denied for user ''@'%' to database 'db1_secret'

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

drop database if exists db2;

create database db2;

use db2;

mysql-test/r/view_grant.result

+88 −9
Original line number Diff line number Diff line
@@ -282,15 +282,6 @@ create view mysqltest.v3 as select b from mysqltest.t2; 
grant create view, update on mysqltest.v3 to mysqltest_1@localhost;

drop view mysqltest.v3;

create view mysqltest.v3 as select b from mysqltest.t2;

grant create view, update, insert on mysqltest.v3 to mysqltest_1@localhost;

drop view mysqltest.v3;

create view mysqltest.v3 as select b from mysqltest.t2;

ERROR 42000: create view command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 'v3'

create table mysqltest.v3 (b int);

grant select(b) on mysqltest.v3 to mysqltest_1@localhost;

drop table mysqltest.v3;

create view mysqltest.v3 as select b from mysqltest.t2;

ERROR 42000: create view command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 'v3'

create view v4 as select b+1 from mysqltest.t2;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for column 'b' in table 't2'

grant create view,update,select on test.* to mysqltest_1@localhost;
@@ -794,4 +785,92 @@ View Create View 
v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS select `t1`.`f2` AS `f2` from `t1`

DROP USER u26813@localhost;

DROP DATABASE db26813;

DROP DATABASE IF EXISTS mysqltest1;

DROP DATABASE IF EXISTS mysqltest2;

CREATE DATABASE mysqltest1;

CREATE DATABASE mysqltest2;

CREATE TABLE mysqltest1.t1(c1 INT);

CREATE TABLE mysqltest1.t2(c2 INT);

CREATE TABLE mysqltest1.t3(c3 INT);

CREATE TABLE mysqltest1.t4(c4 INT);

INSERT INTO mysqltest1.t1 VALUES (11), (12), (13), (14);

INSERT INTO mysqltest1.t2 VALUES (21), (22), (23), (24);

INSERT INTO mysqltest1.t3 VALUES (31), (32), (33), (34);

INSERT INTO mysqltest1.t4 VALUES (41), (42), (43), (44);

GRANT SELECT ON mysqltest1.t1 TO mysqltest_u1@localhost;

GRANT INSERT ON mysqltest1.t2 TO mysqltest_u1@localhost;

GRANT SELECT, UPDATE ON mysqltest1.t3 TO mysqltest_u1@localhost;

GRANT SELECT, DELETE ON mysqltest1.t4 TO mysqltest_u1@localhost;

GRANT ALL PRIVILEGES ON mysqltest2.* TO mysqltest_u1@localhost;



---> connection: bug24040_con

SELECT * FROM mysqltest1.t1;

c1

11

12

13

14

INSERT INTO mysqltest1.t2 VALUES(25);

UPDATE mysqltest1.t3 SET c3 = 331 WHERE c3 = 31;

DELETE FROM mysqltest1.t4 WHERE c4 = 44;

CREATE VIEW v1 AS SELECT * FROM mysqltest1.t1;

CREATE VIEW v2 AS SELECT * FROM mysqltest1.t2;

CREATE VIEW v3 AS SELECT * FROM mysqltest1.t3;

CREATE VIEW v4 AS SELECT * FROM mysqltest1.t4;

SELECT * FROM v1;

c1

11

12

13

14

INSERT INTO v2 VALUES(26);

UPDATE v3 SET c3 = 332 WHERE c3 = 32;

DELETE FROM v4 WHERE c4 = 43;

CREATE VIEW v12 AS SELECT c1, c2 FROM mysqltest1.t1, mysqltest1.t2;

ERROR 42000: create view command denied to user 'mysqltest_u1'@'localhost' for column 'c2' in table 'v12'

CREATE VIEW v13 AS SELECT c1, c3 FROM mysqltest1.t1, mysqltest1.t3;

CREATE VIEW v14 AS SELECT c1, c4 FROM mysqltest1.t1, mysqltest1.t4;

CREATE VIEW v21 AS SELECT c2, c1 FROM mysqltest1.t2, mysqltest1.t1;

ERROR 42000: create view command denied to user 'mysqltest_u1'@'localhost' for column 'c1' in table 'v21'

CREATE VIEW v23 AS SELECT c2, c3 FROM mysqltest1.t2, mysqltest1.t3;

ERROR 42000: create view command denied to user 'mysqltest_u1'@'localhost' for column 'c3' in table 'v23'

CREATE VIEW v24 AS SELECT c2, c4 FROM mysqltest1.t2, mysqltest1.t4;

ERROR 42000: create view command denied to user 'mysqltest_u1'@'localhost' for column 'c4' in table 'v24'

CREATE VIEW v31 AS SELECT c3, c1 FROM mysqltest1.t3, mysqltest1.t1;

CREATE VIEW v32 AS SELECT c3, c2 FROM mysqltest1.t3, mysqltest1.t2;

ERROR 42000: create view command denied to user 'mysqltest_u1'@'localhost' for column 'c2' in table 'v32'

CREATE VIEW v34 AS SELECT c3, c4 FROM mysqltest1.t3, mysqltest1.t4;

CREATE VIEW v41 AS SELECT c4, c1 FROM mysqltest1.t4, mysqltest1.t1;

CREATE VIEW v42 AS SELECT c4, c2 FROM mysqltest1.t4, mysqltest1.t2;

ERROR 42000: create view command denied to user 'mysqltest_u1'@'localhost' for column 'c2' in table 'v42'

CREATE VIEW v43 AS SELECT c4, c3 FROM mysqltest1.t4, mysqltest1.t3;



---> connection: default

SELECT * FROM mysqltest1.t1;

c1

11

12

13

14

SELECT * FROM mysqltest1.t2;

c2

21

22

23

24

25

26

SELECT * FROM mysqltest1.t3;

c3

331

332

33

34

SELECT * FROM mysqltest1.t4;

c4

41

42

DROP DATABASE mysqltest1;

DROP DATABASE mysqltest2;

DROP USER mysqltest_u1@localhost;

End of 5.0 tests.