Commit 99d1dee4 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 

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


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
parents aa420935 79bfd0b9

client/client_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -51,5 +51,5 @@ enum options_client 
  OPT_TRIGGERS,

  OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,

  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO

  OPT_DEBUG_INFO, OPT_ERROR_LOG_FILE

};

client/mysqldump.c

+22 −2
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static char *opt_password=0,*current_user=0, 
             *lines_terminated=0, *enclosed=0, *opt_enclosed=0, *escaped=0,

             *where=0, *order_by=0,

             *opt_compatible_mode_str= 0,

             *err_ptr= 0;

             *err_ptr= 0,

             *log_error_file= NULL;

static char **defaults_argv= 0;

static char compatible_mode_normal_str[255];

static ulong opt_compatible_mode= 0;
@@ -117,6 +118,8 @@ static int first_error=0; 
static DYNAMIC_STRING extended_row;

#include <sslopt-vars.h>

FILE *md_result_file= 0;

FILE *stderror_file=0;



#ifdef HAVE_SMEM

static char *shared_memory_base_name=0;

#endif
@@ -293,6 +296,9 @@ static struct my_option my_long_options[] = 
   0, 0, 0, 0, 0, 0},

  {"lock-tables", 'l', "Lock all tables for read.", (gptr*) &lock_tables,

   (gptr*) &lock_tables, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},

  {"log-error", OPT_ERROR_LOG_FILE, "Append warnings and errors to given file.",

   (gptr*) &log_error_file, (gptr*) &log_error_file, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"master-data", OPT_MASTER_DATA,

   "This causes the binary log position and filename to be appended to the "

   "output. If equal to 1, will print it as a CHANGE MASTER command; if equal"
@@ -3694,6 +3700,16 @@ int main(int argc, char **argv) 
    free_resources(0);

    exit(exit_code);

  }



  if (log_error_file)

  {

    if(!(stderror_file= freopen(log_error_file, "a+", stderr)))

    {

      free_resources(0);

      exit(EX_MYSQLERR);

    }

  }



  if (connect_to_db(current_host, current_user, opt_password))

  {

    free_resources(0);
@@ -3746,5 +3762,9 @@ int main(int argc, char **argv) 
  if (!path)

    write_footer(md_result_file);

  free_resources();



  if (stderror_file)

    fclose(stderror_file);



  return(first_error);

} /* main */

mysql-test/r/information_schema_db.result

+69 −2
Original line number Diff line number Diff line
@@ -106,16 +106,82 @@ use testdb_1; 
create table t1 (f1 char(4));

create view v1 as select f1 from t1;

grant insert on v1 to testdb_2@localhost;

create view v5 as select f1 from t1;

grant show view on v5 to testdb_2@localhost;

create definer=`no_such_user`@`no_such_host` view v6 as select f1 from t1;

ERROR 42000: Access denied; you need the SUPER privilege for this operation

use testdb_1;

create view v6 as select f1 from t1;

grant show view on v6 to testdb_2@localhost;

create table t2 (f1 char(4));

create definer=`no_such_user`@`no_such_host` view v7 as select * from t2;

Warnings:

Note	1449	There is no 'no_such_user'@'no_such_host' registered

show fields from testdb_1.v6;

Field	Type	Null	Key	Default	Extra

f1	char(4)	YES		NULL	

show create view testdb_1.v6;

View	Create View

v6	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v6` AS select `t1`.`f1` AS `f1` from `t1`

show create view testdb_1.v7;

View	Create View

v7	CREATE ALGORITHM=UNDEFINED DEFINER=`no_such_user`@`no_such_host` SQL SECURITY DEFINER VIEW `v7` AS select `testdb_1`.`t2`.`f1` AS `f1` from `t2`

Warnings:

Warning	1356	View 'testdb_1.v7' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them

show fields from testdb_1.v7;

Field	Type	Null	Key	Default	Extra

f1	null	YES		NULL	

Warnings:

Note	1449	There is no 'no_such_user'@'no_such_host' registered

create table t3 (f1 char(4), f2 char(4));

create view v3 as select f1,f2 from t3;

grant insert(f1), insert(f2) on v3 to testdb_2@localhost;

create view v2 as select f1 from testdb_1.v1;

create view v4 as select f1,f2 from testdb_1.v3;

show fields from testdb_1.v5;

Field	Type	Null	Key	Default	Extra

f1	char(4)	YES		NULL	

show create view testdb_1.v5;

View	Create View

v5	CREATE ALGORITHM=UNDEFINED DEFINER=`testdb_1`@`localhost` SQL SECURITY DEFINER VIEW `testdb_1`.`v5` AS select `testdb_1`.`t1`.`f1` AS `f1` from `testdb_1`.`t1`

show fields from testdb_1.v6;

Field	Type	Null	Key	Default	Extra

f1	char(4)	YES		NULL	

show create view testdb_1.v6;

View	Create View

v6	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `testdb_1`.`v6` AS select `testdb_1`.`t1`.`f1` AS `f1` from `testdb_1`.`t1`

show fields from testdb_1.v7;

Field	Type	Null	Key	Default	Extra

f1	null	YES		NULL	

Warnings:

Note	1449	There is no 'no_such_user'@'no_such_host' registered

show create view testdb_1.v7;

View	Create View

v7	CREATE ALGORITHM=UNDEFINED DEFINER=`no_such_user`@`no_such_host` SQL SECURITY DEFINER VIEW `v7` AS select `testdb_1`.`t2`.`f1` AS `f1` from `t2`

Warnings:

Warning	1356	View 'testdb_1.v7' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them

revoke insert(f1) on v3 from testdb_2@localhost;

revoke show view on v5 from testdb_2@localhost;

use testdb_1;

revoke show view on v6 from testdb_2@localhost;

show fields from testdb_1.v5;

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

show create view testdb_1.v5;

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

show fields from testdb_1.v6;

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

show create view testdb_1.v6;

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

show fields from testdb_1.v7;

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

show create view testdb_1.v7;

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

show create view v4;

ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table

show fields from v4;

ERROR HY000: EXPLAIN/SHOW can not be issued; lacking privileges for underlying table

Field	Type	Null	Key	Default	Extra

f1	null	YES		NULL	

f2	char(4)	YES		NULL	

show fields from v2;

Field	Type	Null	Key	Default	Extra

f1	char(4)	YES		NULL
@@ -140,6 +206,7 @@ where a.table_name = 'testdb_1.v1'; 
view_definition

select * from v2;

ERROR HY000: View 'test.v2' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them

use test;

drop view testdb_1.v1, v2, testdb_1.v3, v4;

drop database testdb_1;

drop user testdb_1@localhost;

mysql-test/r/sp.result

+25 −0
Original line number Diff line number Diff line
@@ -5970,3 +5970,28 @@ SUM(f2) bug25373(f1) 
DROP FUNCTION bug25373|

DROP TABLE t3|

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;

mysql-test/r/sp_trans.result

+31 −0
Original line number Diff line number Diff line
@@ -530,3 +530,34 @@ count(*) 
drop table t3, t4|

drop procedure bug14210|

set @@session.max_heap_table_size=default|

drop function if exists bug23333|

drop table if exists t1,t2|

CREATE TABLE t1 (a int  NOT NULL auto_increment primary key) ENGINE=MyISAM|

CREATE TABLE t2 (a int  NOT NULL auto_increment, b int, PRIMARY KEY (a)) ENGINE=InnoDB|

reset master|

insert into t2 values (1,1)|

create function bug23333() 

RETURNS int(11)

DETERMINISTIC

begin

insert into t1 values (null);

select count(*) from t1 into @a;

return @a;

end|

insert into t2 values (bug23333(),1)|

ERROR 23000: Duplicate entry '1' for key 1

show binlog events from 98 /* must show the insert */|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	use `test`; insert into t2 values (1,1)

master-bin.000001	#	Xid	1	#	COMMIT /* xid=1165 */

master-bin.000001	#	Query	1	#	use `test`; CREATE DEFINER=`root`@`localhost` function bug23333() 

RETURNS int(11)

DETERMINISTIC

begin

insert into t1 values (null);

select count(*) from t1 into @a;

return @a;

end

select count(*),@a from t1 /* must be 1,1 */|

count(*)	@a

1	1