Commit fbd929f8 authored by unknown's avatar unknown
Browse files

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel


mysys/my_pread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/heap/hp_write.c:
  Auto merged
mysql-test/t/mysqlbinlog2.test:
  SCCS merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
sql/event_db_repository.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents e552b08f e57c8007

client/mysqlbinlog.cc

+12 −5
Original line number Diff line number Diff line
@@ -1099,7 +1099,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");
@@ -1162,7 +1162,7 @@ could be out of memory"); 
    }

    if (len < 8 && net->read_pos[0] == 254)

      break; // end of data

    DBUG_PRINT("info",( "len: %lu, net->read_pos[5]: %d\n",

    DBUG_PRINT("info",( "len: %lu  net->read_pos[5]: %d\n",

			len, net->read_pos[5]));

    if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

                                        len - 1, &error_msg,
@@ -1252,8 +1252,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

+77 −30
Original line number Diff line number Diff line
@@ -260,29 +260,29 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' IDENTIFIED BY PASSWORD '*2470C0C 
GRANT SELECT, INSERT, UPDATE ON `test`.* TO 'mysqltest_1'@'localhost'

drop user mysqltest_1@localhost;

SET NAMES koi8r;

CREATE DATABASE ;

USE ;

CREATE TABLE  ( int);

GRANT SELECT ON .* TO @localhost;

SHOW GRANTS FOR @localhost;

Grants for @localhost

GRANT USAGE ON *.* TO ''@'localhost'

GRANT SELECT ON ``.* TO ''@'localhost'

REVOKE SELECT ON .* FROM @localhost;

GRANT SELECT ON . TO @localhost;

SHOW GRANTS FOR @localhost;

Grants for @localhost

GRANT USAGE ON *.* TO ''@'localhost'

GRANT SELECT ON ``.`` TO ''@'localhost'

REVOKE SELECT ON . FROM @localhost;

GRANT SELECT () ON . TO @localhost;

SHOW GRANTS FOR @localhost;

Grants for @localhost

GRANT USAGE ON *.* TO ''@'localhost'

GRANT SELECT () ON ``.`` TO ''@'localhost'

REVOKE SELECT () ON . FROM @localhost;

DROP USER @localhost;

DROP DATABASE ;

CREATE DATABASE ﾂﾄ;

USE ﾂﾄ;

CREATE TABLE ﾔﾁﾂ (ﾋﾏﾌ int);

GRANT SELECT ON ﾂﾄ.* TO ﾀﾚﾅﾒ@localhost;

SHOW GRANTS FOR ﾀﾚﾅﾒ@localhost;

Grants for ﾀﾚﾅﾒ@localhost

GRANT USAGE ON *.* TO 'ﾀﾚﾅﾒ'@'localhost'

GRANT SELECT ON `ﾂﾄ`.* TO 'ﾀﾚﾅﾒ'@'localhost'

REVOKE SELECT ON ﾂﾄ.* FROM ﾀﾚﾅﾒ@localhost;

GRANT SELECT ON ﾂﾄ.ﾔﾁﾂ TO ﾀﾚﾅﾒ@localhost;

SHOW GRANTS FOR ﾀﾚﾅﾒ@localhost;

Grants for ﾀﾚﾅﾒ@localhost

GRANT USAGE ON *.* TO 'ﾀﾚﾅﾒ'@'localhost'

GRANT SELECT ON `ﾂﾄ`.`ﾔﾁﾂ` TO 'ﾀﾚﾅﾒ'@'localhost'

REVOKE SELECT ON ﾂﾄ.ﾔﾁﾂ FROM ﾀﾚﾅﾒ@localhost;

GRANT SELECT (ﾋﾏﾌ) ON ﾂﾄ.ﾔﾁﾂ TO ﾀﾚﾅﾒ@localhost;

SHOW GRANTS FOR ﾀﾚﾅﾒ@localhost;

Grants for ﾀﾚﾅﾒ@localhost

GRANT USAGE ON *.* TO 'ﾀﾚﾅﾒ'@'localhost'

GRANT SELECT (ﾋﾏﾌ) ON `ﾂﾄ`.`ﾔﾁﾂ` TO 'ﾀﾚﾅﾒ'@'localhost'

REVOKE SELECT (ﾋﾏﾌ) ON ﾂﾄ.ﾔﾁﾂ FROM ﾀﾚﾅﾒ@localhost;

DROP USER ﾀﾚﾅﾒ@localhost;

DROP DATABASE ﾂﾄ;

SET NAMES latin1;

USE test;

CREATE TABLE t1 (a int );
@@ -613,22 +613,22 @@ set @user123="non-existent"; 
select * from mysql.db where user=@user123;

Host	Db	User	Select_priv	Insert_priv	Update_priv	Delete_priv	Create_priv	Drop_priv	Grant_priv	References_priv	Index_priv	Alter_priv	Create_tmp_table_priv	Lock_tables_priv	Create_view_priv	Show_view_priv	Create_routine_priv	Alter_routine_priv	Execute_priv	Event_priv	Trigger_priv

set names koi8r;

create database ;

grant select on .* to root@localhost;

select hex(Db) from mysql.db where Db='';

create database ﾂﾄ;

grant select on ﾂﾄ.* to root@localhost;

select hex(Db) from mysql.db where Db='ﾂﾄ';

hex(Db)

D0B1D0B4

show grants for root@localhost;

Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

GRANT SELECT ON ``.* TO 'root'@'localhost'

GRANT SELECT ON `ﾂﾄ`.* TO 'root'@'localhost'

flush privileges;

show grants for root@localhost;

Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION

GRANT SELECT ON ``.* TO 'root'@'localhost'

drop database ;

revoke all privileges on .* from root@localhost;

GRANT SELECT ON `ﾂﾄ`.* TO 'root'@'localhost'

drop database ﾂﾄ;

revoke all privileges on ﾂﾄ.* from root@localhost;

show grants for root@localhost;

Grants for root@localhost

GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
@@ -1059,4 +1059,51 @@ DROP DATABASE bug23556; 
DROP USER bug23556@localhost;

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*/;
@@ -482,6 +500,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/sp.result

+40 −0
Original line number Diff line number Diff line
@@ -6061,4 +6061,44 @@ SUM(f2) bug25373(f1) 
21.300000071526	NULL

DROP FUNCTION bug25373|

DROP TABLE t3|

DROP DATABASE IF EXISTS mysqltest1|

DROP DATABASE IF EXISTS mysqltest2|

CREATE DATABASE mysqltest1|

CREATE DATABASE mysqltest2|

CREATE PROCEDURE mysqltest1.p1()

DROP DATABASE mysqltest2|

use mysqltest2|

CALL mysqltest1.p1()|

Warnings:

Note	1049	Unknown database 'mysqltest2'

SELECT DATABASE()|

DATABASE()

NULL

DROP DATABASE mysqltest1|

use test|

drop table t1,t2;

CREATE TABLE t1 (a int auto_increment primary key) engine=MyISAM;

CREATE TABLE t2 (a int auto_increment primary key, b int) engine=innodb;

set @a=0;

CREATE function bug27354() RETURNS int deterministic

begin

insert into t1 values (null);

set @a=@a+1;

return @a;

end|

update t2 set b=1 where a=bug27354();

select count(t_1.a),count(t_2.a) from t1 as t_1, t2 as t_2 /* must be 0,0 */;

count(t_1.a)	count(t_2.a)

0	0

insert into t2 values (1,1),(2,2),(3,3);

update t2 set b=-b where a=bug27354();

select * from t2 /* must return 1,-1 ... */;

a	b

1	-1

2	-2

3	-3

select count(*) from t1 /* must be 3 */;

count(*)

3

drop table t1,t2;

drop function   bug27354;