Commit 213c0540 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0


BitKeeper/etc/config:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp-security.result:
  merge
mysql-test/r/view.result:
  merge
mysql-test/t/sp-security.test:
  merge
mysql-test/t/view.test:
  merge
sql/item_cmpfunc.cc:
  merge
sql/sql_class.h:
  merge
parents d49ddbd7 e84229b0

mysql-test/r/sp-security.result

+24 −0
Original line number Diff line number Diff line
@@ -212,3 +212,27 @@ REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost; 
drop function bug_9503;

use test;

drop database mysqltest;

use test;

select current_user();

current_user()

root@localhost

select user();

user()

root@localhost

create procedure bug7291_0 () sql security invoker select current_user(), user();

create procedure bug7291_1 () sql security definer call bug7291_0();

create procedure bug7291_2 () sql security invoker call bug7291_0();

grant execute on procedure bug7291_0 to user1@localhost;

grant execute on procedure bug7291_1 to user1@localhost;

grant execute on procedure bug7291_2 to user1@localhost;

call bug7291_2();

current_user()	user()

user1@localhost	user1@localhost

call bug7291_1();

current_user()	user()

root@localhost	user1@localhost

drop procedure bug7291_1;

drop procedure bug7291_2;

drop procedure bug7291_0;

REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;

drop user user1@localhost;

mysql-test/r/view.result

+25 −0
Original line number Diff line number Diff line
@@ -1831,6 +1831,31 @@ select * from v1; 
t

01:00

drop view v1;

create table t1 (a timestamp default now());

create table t2 (b timestamp default now());

create view v1 as select a,b,t1.a < now() from t1,t2 where t1.a < now();

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select sql_no_cache `test`.`t1`.`a` AS `a`,`test`.`t2`.`b` AS `b`,(`test`.`t1`.`a` < now()) AS `t1.a < now()` from `test`.`t1` join `test`.`t2` where (`test`.`t1`.`a` < now())

drop view v1;

drop table t1, t2;

CREATE TABLE t1 ( a varchar(50) );

CREATE VIEW v1 AS SELECT * FROM t1 WHERE a = CURRENT_USER();

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select sql_no_cache `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` = current_user())

DROP VIEW v1;

CREATE VIEW v1 AS SELECT * FROM t1 WHERE a = VERSION();

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` = version())

DROP VIEW v1;

CREATE VIEW v1 AS SELECT * FROM t1 WHERE a = DATABASE();

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `test`.`v1` AS select sql_no_cache `test`.`t1`.`a` AS `a` from `test`.`t1` where (`test`.`t1`.`a` = database())

DROP VIEW v1;

DROP TABLE t1;

CREATE TABLE t1 (col1 time);

CREATE TABLE t2 (col1 time);

CREATE VIEW v1 AS SELECT CONVERT_TZ(col1,'GMT','MET') FROM t1;

mysql-test/t/sp-security.test

+30 −0
Original line number Diff line number Diff line
@@ -341,3 +341,33 @@ REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost; 
drop function bug_9503;

use test;

drop database mysqltest;



#

# correct value from current_user() in function run from "security definer"

# (BUG#7291)

#

connection con1root;

use test;



select current_user();

select user();

create procedure bug7291_0 () sql security invoker select current_user(), user();

create procedure bug7291_1 () sql security definer call bug7291_0();

create procedure bug7291_2 () sql security invoker call bug7291_0();

grant execute on procedure bug7291_0 to user1@localhost;

grant execute on procedure bug7291_1 to user1@localhost;

grant execute on procedure bug7291_2 to user1@localhost;



connect (user1,localhost,user1,,);

connection user1;



call bug7291_2();

call bug7291_1();



connection con1root;

drop procedure bug7291_1;

drop procedure bug7291_2;

drop procedure bug7291_0;

disconnect user1;

REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;

drop user user1@localhost;

mysql-test/t/view.test

+21 −0
Original line number Diff line number Diff line
@@ -1673,6 +1673,27 @@ create view v1 as SELECT TIME_FORMAT(SEC_TO_TIME(3600),'%H:%i') as t; 
select * from v1;

drop view v1;



#

# evaluation constant functions in WHERE (BUG#4663)

#

create table t1 (a timestamp default now());

create table t2 (b timestamp default now());

create view v1 as select a,b,t1.a < now() from t1,t2 where t1.a < now();

SHOW CREATE VIEW v1;

drop view v1;

drop table t1, t2;

CREATE TABLE t1 ( a varchar(50) );

CREATE VIEW v1 AS SELECT * FROM t1 WHERE a = CURRENT_USER();

SHOW CREATE VIEW v1;

DROP VIEW v1;

CREATE VIEW v1 AS SELECT * FROM t1 WHERE a = VERSION();

SHOW CREATE VIEW v1;

DROP VIEW v1;

CREATE VIEW v1 AS SELECT * FROM t1 WHERE a = DATABASE();

SHOW CREATE VIEW v1;

DROP VIEW v1;

DROP TABLE t1;



#

# checking views after some view with error (BUG#11337)

#

sql/item.cc

+27 −0
Original line number Diff line number Diff line
@@ -663,6 +663,33 @@ Item *Item_string::safe_charset_converter(CHARSET_INFO *tocs) 
}





Item *Item_static_string_func::safe_charset_converter(CHARSET_INFO *tocs)

{

  Item_string *conv;

  uint conv_errors;

  String tmp, cstr, *ostr= val_str(&tmp);

  cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), tocs, &conv_errors);

  if (conv_errors ||

      !(conv= new Item_static_string_func(func_name,

                                          cstr.ptr(), cstr.length(),

                                          cstr.charset(),

                                          collation.derivation)))

  {

    /*

      Safe conversion is not possible (or EOM).

      We could not convert a string into the requested character set

      without data loss. The target charset does not cover all the

      characters from the string. Operation cannot be done correctly.

    */

    return NULL;

  }

  conv->str_value.copy();

  /* Ensure that no one is going to change the result string */

  conv->str_value.mark_as_const();

  return conv;

}





bool Item_string::eq(const Item *item, bool binary_cmp) const

{

  if (type() == item->type() && item->basic_const_item())