Commit 33b1d6f6 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-owner2-5.0


sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  merge
parents 89e0804d 2fcdbb8d

mysql-test/r/func_in.result

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ a 
CREATE VIEW v1 AS SELECT * FROM t1 WHERE a NOT IN (45);

SHOW CREATE VIEW v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` <> 45)

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1` where (`t1`.`a` <> 45)

SELECT * FROM v1;

a

44

mysql-test/r/lowercase_view.result

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ create table TaB (Field int); 
create view ViE as select * from TAb;

show create table VIe;

View	Create View

vie	CREATE ALGORITHM=UNDEFINED VIEW `vie` AS select `tab`.`Field` AS `Field` from `tab`

vie	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `vie` AS select `tab`.`Field` AS `Field` from `tab`

drop database MySQLTest;

use test;

create table t1Aa (col1 int);
@@ -119,7 +119,7 @@ create table t1Aa (col1 int); 
create view v1Aa as select col1 from t1Aa as AaA;

show create view v1AA;

View	Create View

v1aa	CREATE ALGORITHM=UNDEFINED VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `AaA`

v1aa	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `AaA`

drop view v1AA;

select Aaa.col1 from t1Aa as AaA;

col1
@@ -128,6 +128,6 @@ drop view v1AA; 
create view v1Aa as select AaA.col1 from t1Aa as AaA;

show create view v1AA;

View	Create View

v1aa	CREATE ALGORITHM=UNDEFINED VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `AaA`

v1aa	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1aa` AS select `aaa`.`col1` AS `col1` from `t1aa` `AaA`

drop view v1AA;

drop table t1Aa;

mysql-test/r/mysqldump.result

+4 −4
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ DROP TABLE IF EXISTS `v2`; 
) ENGINE=MyISAM DEFAULT CHARSET=latin1*/;

/*!50001 DROP TABLE IF EXISTS `v2`*/;

/*!50001 DROP VIEW IF EXISTS `v2`*/;

/*!50001 CREATE ALGORITHM=UNDEFINED VIEW `v2` AS select `t2`.`a` AS `a` from `t2` where (`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION*/;

/*!50001 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t2`.`a` AS `a` from `t2` where (`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION*/;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1631,7 +1631,7 @@ DROP TABLE IF EXISTS `v1`; 
) ENGINE=MyISAM DEFAULT CHARSET=latin1*/;

/*!50001 DROP TABLE IF EXISTS `v1`*/;

/*!50001 DROP VIEW IF EXISTS `v1`*/;

/*!50001 CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select `t1`.`a` AS `a` from `t1`*/;

/*!50001 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a` from `t1`*/;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1683,7 +1683,7 @@ DROP TABLE IF EXISTS `v2`; 
) ENGINE=MyISAM DEFAULT CHARSET=latin1*/;

/*!50001 DROP TABLE IF EXISTS `v2`*/;

/*!50001 DROP VIEW IF EXISTS `v2`*/;

/*!50001 CREATE ALGORITHM=UNDEFINED VIEW `v2` AS select `t2`.`a` AS `a` from `t2` where (`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION*/;

/*!50001 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS select `t2`.`a` AS `a` from `t2` where (`t2`.`a` like _latin1'a%') WITH CASCADED CHECK OPTION*/;



/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;

/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@@ -1747,7 +1747,7 @@ v2 VIEW 
v3	VIEW

show create view v1;

View	Create View

v1	CREATE ALGORITHM=UNDEFINED VIEW `v1` AS select `v3`.`a` AS `a`,`v3`.`b` AS `b`,`v3`.`c` AS `c` from `v3` where (`v3`.`b` in (1,2,3,4,5,6,7))

v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `v3`.`a` AS `a`,`v3`.`b` AS `b`,`v3`.`c` AS `c` from `v3` where (`v3`.`b` in (1,2,3,4,5,6,7))

select * from v1;

a	b	c

1	2	one

mysql-test/r/rpl_view.result

+13 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; 
start slave;

drop table if exists t1,v1;

drop view if exists t1,v1;

reset master;

create table t1 (a int);

insert into t1 values (1);

create view v1 as select a from t1;
@@ -42,3 +43,15 @@ drop view v1; 
select * from v1 order by a;

ERROR 42S02: Table 'test.v1' doesn't exist

drop table t1;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: 5.0.13-beta-debug-log, Binlog ver: 4

slave-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)

slave-bin.000001	#	Query	1	#	use `test`; insert into t1 values (1)

slave-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a from t1

slave-bin.000001	#	Query	1	#	use `test`; insert into v1 values (2)

slave-bin.000001	#	Query	1	#	use `test`; update v1 set a=3 where a=1

slave-bin.000001	#	Query	1	#	use `test`; delete from v1 where a=2

slave-bin.000001	#	Query	1	#	use `test`; ALTER ALGORITHM=UNDEFINED DEFINER=root@localhost SQL SECURITY DEFINER VIEW v1 AS select a as b from t1

slave-bin.000001	#	Query	1	#	use `test`; drop view v1

slave-bin.000001	#	Query	1	#	use `test`; drop table t1

mysql-test/r/skip_grants.result

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ drop procedure if exists f1; 
use test;

create table t1 (field1 INT);

CREATE VIEW v1 AS SELECT field1 FROM t1;

drop view v1;

ERROR HY000: View definer is not fully qualified

drop table t1;

create procedure f1() select 1;

drop procedure f1;